Added support for blocking on multiple sockets simultaneously

This commit is contained in:
Fred Nicolson
2016-12-09 23:52:16 +00:00
parent 9cbe2aa8e8
commit b581418f2e
8 changed files with 171 additions and 33 deletions
+65 -27
View File
@@ -2,26 +2,66 @@
#include <Packet.h>
#include <TcpSocket.h>
#include <TcpListener.h>
#include <SocketSelector.h>
#include <thread>
#include <atomic>
#include <vector>
std::atomic<uint64_t> data_sent;
void server()
{
fr::TcpListener listener;
listener.listen("8081");
fr::TcpSocket socket;
listener.accept(socket);
while(socket.connected())
if(listener.listen("8081") != fr::Socket::Success)
{
fr::Packet packet;
socket.receive(packet);
std::cout << "Failed to listen to port" << std::endl;
return;
}
std::string message;
packet >> message;
data_sent += 0x100000;
fr::SocketSelector selector;
std::vector<std::unique_ptr<fr::TcpSocket>> clients;
selector.add(listener);
while(selector.wait())
{
if(selector.is_ready(listener))
{
clients.emplace_back(new fr::TcpSocket());
if(listener.accept(*clients.back()) != fr::Socket::Success)
{
clients.pop_back();
continue;
}
selector.add(*clients.back());
std::cout << "Got new connection from: " << clients.back()->get_remote_address() << std::endl;
}
else
{
for(auto iter = clients.begin(); iter != clients.end();)
{
if(selector.is_ready(**iter))
{
fr::Packet packet;
if((*iter)->receive(packet) == fr::Socket::Success)
{
std::string message;
packet >> message;
std::cout << (*iter)->get_remote_address() << " sent: " << message << std::endl;
iter++;
}
else
{
std::cout << (*iter)->get_remote_address() << " has disconnected." << std::endl;
selector.remove(*iter->get());
iter = clients.erase(iter);
}
}
else
{
iter++;
}
}
}
}
}
@@ -30,33 +70,31 @@ void client()
fr::TcpSocket socket;
socket.connect("127.0.0.1", "8081");
std::string buffer(0x100000, 'c');
fr::TcpSocket socket2;
socket2.connect("127.0.0.1", "8081");
fr::Packet packet;
packet << buffer;
while(true)
{
socket.send(packet);
}
packet << "Hello, World! - From socket 1";
socket.send(packet);
packet.clear();
packet << "Hello, world! - From socket 2";
socket2.send(packet);
return;
}
int main()
{
data_sent = 0;
std::thread t1(&server);
std::this_thread::sleep_for(std::chrono::milliseconds(100));
auto start = std::chrono::system_clock::now();
std::thread t2(&client);
while(true)
{
std::this_thread::sleep_for(std::chrono::seconds(1));
uint64_t mb_sent = data_sent / 0x100000;
std::cout << "Transfer speed: " << mb_sent / (uint64_t)std::chrono::duration<double>(std::chrono::system_clock::now() - start).count() << "MBps" << std::endl;
}
t1.join();
return 0;
}