Updating test and api

Author: smasherprog

Test/main.cpp

@@ -12,8 +12,6 @@
 using namespace std::chrono_literals;
 
 void wssautobahntest() {
-    // auto listener = SL::WS_LITE::WSListener::CreateListener(3001, TEST_CERTIFICATE_PRIVATE_PASSWORD, TEST_CERTIFICATE_PRIVATE_PATH, TEST_CERTIFICATE_PUBLIC_PATH, TEST_DH_PATH);
-
 
     SL::WS_LITE::WSContext ctx(SL::WS_LITE::ThreadCount(1));
 
@@ -77,7 +75,6 @@ void wssautobahntest() {
 }
 void generaltest() {
     std::cout << "Starting General test..." << std::endl;
-    //auto listener = SL::WS_LITE::WSListener::CreateListener(3002, TEST_CERTIFICATE_PRIVATE_PASSWORD, TEST_CERTIFICATE_PRIVATE_PATH, TEST_CERTIFICATE_PUBLIC_PATH, TEST_DH_PATH);
 
     SL::WS_LITE::PortNumber port(3002);
     SL::WS_LITE::WSContext ctx(SL::WS_LITE::ThreadCount(1));
@@ -109,8 +106,6 @@ void generaltest() {
     });
     listener.startlistening();
 
-    //auto client = SL::WS_LITE::WSClient::CreateClient(TEST_CERTIFICATE_PUBLIC_PATH);
-
     auto client = ctx.CreateClient();
     client.onHttpUpgrade([&](const SL::WS_LITE::WSocket& socket) {
         lastheard = std::chrono::high_resolution_clock::now();
@@ -135,9 +130,9 @@ void multithreadtest() {
     std::cout << "Starting Multi threaded test..." << std::endl;
 
     SL::WS_LITE::PortNumber port(3003);
-    SL::WS_LITE::WSContext ctx(SL::WS_LITE::ThreadCount(4));
+    SL::WS_LITE::WSContext listenerctx(SL::WS_LITE::ThreadCount(2));
 
-    auto listener = ctx.CreateListener(port);
+    auto listener = listenerctx.CreateListener(port);
     auto lastheard = std::chrono::high_resolution_clock::now();
     listener.onHttpUpgrade([&](const SL::WS_LITE::WSocket& socket) {
         lastheard = std::chrono::high_resolution_clock::now();
@@ -160,10 +155,11 @@ void multithreadtest() {
     });
     listener.startlistening();
     std::vector<SL::WS_LITE::WSClient> clients;
-    clients.reserve(100);
-    for (auto i = 0; i < 100; i++) {
+    SL::WS_LITE::WSContext clientctx(SL::WS_LITE::ThreadCount(2));
+    clients.reserve(50);
+    for (auto i = 0; i < 50; i++) {
 
-        clients.push_back(ctx.CreateClient());
+        clients.push_back(clientctx.CreateClient());
         clients[i].onHttpUpgrade([&](const SL::WS_LITE::WSocket& socket) {
             lastheard = std::chrono::high_resolution_clock::now();
         });
@@ -197,7 +193,7 @@ void multithreadthroughputtest() {
     std::cout << "Starting Multi threaded throughput test" << std::endl;
 
     SL::WS_LITE::PortNumber port(3004);
-    SL::WS_LITE::WSContext listenerctx(SL::WS_LITE::ThreadCount(8));
+    SL::WS_LITE::WSContext listenerctx(SL::WS_LITE::ThreadCount(2));
     std::vector<SL::WS_LITE::WSClient> clients;
     clients.reserve(50);//this should use about 1 GB of memory between sending and receiving
 
@@ -228,7 +224,7 @@ void multithreadthroughputtest() {
 
     std::atomic<unsigned long long> mbssent;
     mbssent = 0;
-    SL::WS_LITE::WSContext clientctx(SL::WS_LITE::ThreadCount(8));
+    SL::WS_LITE::WSContext clientctx(SL::WS_LITE::ThreadCount(2));
     auto sendtimer = std::chrono::high_resolution_clock::now();
     for (size_t i = 0; i < clients.capacity(); i++) {
 
@@ -266,7 +262,7 @@ void multithreadthroughputtest() {
     std::cout << "Received " << mbsreceived<<"  bytes"<< std::endl;
 }
 int main(int argc, char* argv[]) {
-    wssautobahntest();
+    //wssautobahntest();
     std::this_thread::sleep_for(1s);
     generaltest();
     std::this_thread::sleep_for(1s);

include/WS_Lite.h

@@ -53,15 +53,19 @@ namespace SL {
             unsigned char *data;
             size_t len;
             OpCode code;
+            //buffer is here to ensure the lifetime of the unsigned char *data in this structure
+            //users should set the *data variable to be the beginning of the data to send. Then, set the Buffer shared ptr as well to make sure the lifetime of the data
             std::shared_ptr<unsigned char> Buffer;
         };
 
-  
+        class WSListener;
+        class WSClient;
         struct WSocketImpl;
-        struct WSocket {
+        class WSocket {
             std::shared_ptr<WSocketImpl> WSocketImpl_;
-            WSocket(const std::shared_ptr<WSocketImpl>& s) :WSocketImpl_(s){}
-            WSocket() {}
+        public:
+            WSocket(const std::shared_ptr<WSocketImpl>& s) :WSocketImpl_(s) {}
+            //WSocket() {}
             //can be used to compare two WSocket objects
             bool operator=(const WSocket& s) { return s.WSocketImpl_ == WSocketImpl_; }
             bool is_open();
@@ -71,7 +75,8 @@ namespace SL {
             bool is_v6();
             bool is_loopback();
             operator bool() const { return WSocketImpl_.operator bool(); }
-
+            friend WSListener;
+            friend WSClient;
         };
         class WSContext;
         class WSListenerImpl;