From dbcfa44d78257b6d6dc2f11d327d93109badadf9 Mon Sep 17 00:00:00 2001 From: Peter Thorson Date: Thu, 27 Oct 2011 11:44:26 -0500 Subject: [PATCH 1/2] fixes echo_client, absolute vs relative include, adds some debug info --- examples/echo_client/echo_client.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/examples/echo_client/echo_client.cpp b/examples/echo_client/echo_client.cpp index fc5f96057c..c5f9cad852 100644 --- a/examples/echo_client/echo_client.cpp +++ b/examples/echo_client/echo_client.cpp @@ -27,7 +27,7 @@ #include "echo_client_handler.hpp" -#include +#include "../../src/websocketpp.hpp" #include #include @@ -61,28 +61,28 @@ int main(int argc, char* argv[]) { std::cout << "case count: " << c->m_case_count << std::endl; for (int i = 1; i <= c->m_case_count; i++) { + std::cout << "Resetting io_service" << std::endl; io_service.reset(); - //boost::asio::io_service ios; - - //client.reset(); - //client = websocketpp::client_ptr(new websocketpp::client(io_service,c)); - - std::cout << "foo: " << i << std::endl; - //websocketpp::client_ptr client2(new websocketpp::client(io_service,c)); client->set_alog_level(websocketpp::ALOG_OFF); client->set_elog_level(websocketpp::LOG_OFF); + std::cout << "Initializing client" << std::endl; client->init(); client->set_header("User Agent","WebSocket++/2011-10-27"); - std::stringstream foo; + std::stringstream url; - foo << "ws://localhost:9001/runCase?case=" << i << "&agent=\"WebSocket++Snapshot/2011-10-27\""; + url << "ws://localhost:9001/runCase?case=" << i << "&agent=\"WebSocket++Snapshot/2011-10-27\""; - client->connect(foo.str()); + std::cout << "Parsing URL and resolving DNS" << std::endl; + client->connect(url.str()); + + std::cout << "Starting io_service for test " << i << std::endl; io_service.run(); + + std::cout << "test " << i << " complete" << std::endl; } std::cout << "done" << std::endl; From 3b57b8697396b8124a04116eb24640a3683fdb26 Mon Sep 17 00:00:00 2001 From: Peter Thorson Date: Thu, 27 Oct 2011 11:55:49 -0500 Subject: [PATCH 2/2] adds times to echo client debug --- examples/echo_client/echo_client.cpp | 11 ++++++----- examples/echo_client/echo_client_handler.cpp | 5 +++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/examples/echo_client/echo_client.cpp b/examples/echo_client/echo_client.cpp index c5f9cad852..5d9fcff200 100644 --- a/examples/echo_client/echo_client.cpp +++ b/examples/echo_client/echo_client.cpp @@ -30,6 +30,7 @@ #include "../../src/websocketpp.hpp" #include #include +#include #include @@ -61,13 +62,13 @@ int main(int argc, char* argv[]) { std::cout << "case count: " << c->m_case_count << std::endl; for (int i = 1; i <= c->m_case_count; i++) { - std::cout << "Resetting io_service" << std::endl; + std::cout << boost::posix_time::to_iso_extended_string(boost::posix_time::microsec_clock::local_time()) << " Resetting io_service" << std::endl; io_service.reset(); client->set_alog_level(websocketpp::ALOG_OFF); client->set_elog_level(websocketpp::LOG_OFF); - std::cout << "Initializing client" << std::endl; + std::cout << boost::posix_time::to_iso_extended_string(boost::posix_time::microsec_clock::local_time()) << " Initializing client (constructing socket)" << std::endl; client->init(); client->set_header("User Agent","WebSocket++/2011-10-27"); @@ -76,13 +77,13 @@ int main(int argc, char* argv[]) { url << "ws://localhost:9001/runCase?case=" << i << "&agent=\"WebSocket++Snapshot/2011-10-27\""; - std::cout << "Parsing URL and resolving DNS" << std::endl; + std::cout << boost::posix_time::to_iso_extended_string(boost::posix_time::microsec_clock::local_time()) << " Parsing URL and resolving DNS" << std::endl; client->connect(url.str()); - std::cout << "Starting io_service for test " << i << std::endl; + std::cout << boost::posix_time::to_iso_extended_string(boost::posix_time::microsec_clock::local_time()) << " Starting io_service for test " << i << std::endl; io_service.run(); - std::cout << "test " << i << " complete" << std::endl; + std::cout << boost::posix_time::to_iso_extended_string(boost::posix_time::microsec_clock::local_time()) << " test " << i << " complete" << std::endl; } std::cout << "done" << std::endl; diff --git a/examples/echo_client/echo_client_handler.cpp b/examples/echo_client/echo_client_handler.cpp index 88d08513b6..2fd72272db 100644 --- a/examples/echo_client/echo_client_handler.cpp +++ b/examples/echo_client/echo_client_handler.cpp @@ -28,16 +28,17 @@ #include "echo_client_handler.hpp" #include +#include using websocketecho::echo_client_handler; using websocketpp::client_session_ptr; void echo_client_handler::on_open(session_ptr s) { - std::cout << "Successfully connected: " << s->get_resource() << std::endl; + std::cout << boost::posix_time::to_iso_extended_string(boost::posix_time::microsec_clock::local_time()) << " Successfully connected (handshake complete): " << s->get_resource() << std::endl; } void echo_client_handler::on_close(session_ptr s) { - std::cout << "client was disconnected" << std::endl; + std::cout << boost::posix_time::to_iso_extended_string(boost::posix_time::microsec_clock::local_time()) << " client was disconnected (WS state is now CLOSED)" << std::endl; } void echo_client_handler::on_message(session_ptr s,const std::string &msg) {