tom/doorlockd-mirror
1
0
Fork 0
mirror of https://github.com/binary-kitchen/doorlockd synced 2024-12-22 18:34:25 +01:00
Code Issues Releases Wiki Activity

Switched to asynchronous asio handling

Browse Source
This commit is contained in:
Ralf Ramsauer 2015-09-30 15:21:41 +02:00
parent 17516379d7
commit 765e41afd5
1 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
doorlockd/client/doorlock-client.cpp
View File

@ -6,6 +6,8 @@
#include <boost/asio.hpp> #include <boost/asio.hpp>
#include <boost/program_options.hpp> #include <boost/program_options.hpp>
#include <QApplication>
#include "config.h" #include "config.h"
#include "../lib/clientmessage.h" #include "../lib/clientmessage.h"
@ -23,9 +25,10 @@ const static std::string gitversion =
const static Logger &l = Logger::get(); const static Logger &l = Logger::get();
namespace po = boost::program_options; namespace po = boost::program_options;
using boost::asio::ip::tcp; namespace ba = boost::asio;
using ba::ip::tcp;
boost::asio::io_service io_service; ba::io_service io_service;
const static std::string subscriptionCommand = const static std::string subscriptionCommand =
"{ \"command\": \"subscribe\"}"; "{ \"command\": \"subscribe\"}";
@ -67,7 +70,7 @@ static int doorlock_client(const std::string &hostname,
tcp::resolver::query query(hostname, std::to_string(port)); tcp::resolver::query query(hostname, std::to_string(port));
tcp::resolver::iterator endpoint_iterator = resolver.resolve(query); tcp::resolver::iterator endpoint_iterator = resolver.resolve(query);
tcp::resolver::iterator end; tcp::resolver::iterator end;
boost::system::error_code error = boost::asio::error::host_not_found; boost::system::error_code error = ba::error::host_not_found;
size_t length; size_t length;
std::vector<char> data; std::vector<char> data;
@ -79,19 +82,30 @@ static int doorlock_client(const std::string &hostname,
throw boost::system::system_error(error); throw boost::system::system_error(error);
// After connection is established, send the subscription command // After connection is established, send the subscription command
socket.write_some(boost::asio::buffer(subscriptionCommand), error); socket.write_some(ba::buffer(subscriptionCommand), error);
if (error) if (error)
throw boost::system::system_error(error); throw boost::system::system_error(error);
data.resize(SOCKET_BUFFERLENGTH); data.resize(SOCKET_BUFFERLENGTH);
for (;run;) {
length = socket.read_some(boost::asio::buffer(data), error); std::function<void(void)> receiveMessage = [&] () {
if (error) socket.async_read_some(ba::buffer(data),
throw boost::system::system_error(error); [&] (const boost::system::error_code &ec,
const size_t length)
{
if (ec) {
throw boost::system::system_error(ec);
}
const auto message = Clientmessage::fromJson(std::string(data.begin(), data.begin()+length)); const auto message = Clientmessage::fromJson(std::string(data.begin(), data.begin()+length));
onDoorlockUpdate(message); onDoorlockUpdate(message);
}
receiveMessage();
});
};
receiveMessage();
io_service.run();
} }
catch(const std::exception &e) catch(const std::exception &e)
{ {
@ -163,6 +177,9 @@ int main(int argc, char** argv)
// This routine will never return in normal operation // This routine will never return in normal operation
app.exec(); app.exec();
// Stop the IO service
io_service.stop();
clientThread.join(); clientThread.join();
if (mainWindow) if (mainWindow)