add varialbe args support in event callback.

melode11 · melode11 · commit 0b0f265c3990 · 2015-04-23T01:20:43.000+08:00
diff --git a/src/sio_message.h b/src/sio_message.h
@@ -240,6 +240,18 @@ namespace sio
         {
         }
 
+        list(message::list&& rhs):
+            m_vector(std::move(rhs.m_vector))
+        {
+
+        }
+
+        list(message::list const& rhs):
+            m_vector(rhs.m_vector)
+        {
+
+        }
+
         list(message::ptr const& message)
         {
             if(message)
@@ -285,6 +297,11 @@ namespace sio
             return m_vector[i];
         }
 
+        const message::ptr& operator[] (size_t i) const
+        {
+            return m_vector[i];
+        }
+
         message::ptr to_array_message(string const& event_name) const
         {
             message::ptr arr = array_message::create();
diff --git a/src/sio_socket.cpp b/src/sio_socket.cpp
@@ -30,7 +30,7 @@ namespace sio
             return std::bind(&event_adapter::adapt_func, func,std::placeholders::_1);
         }
         
-        static inline event create_event(std::string const& nsp,std::string const& name,message::ptr const& message,bool need_ack)
+        static inline event create_event(std::string const& nsp,std::string const& name,message::list&& message,bool need_ack)
         {
             return event(nsp,name,message,need_ack);
         }
@@ -51,7 +51,19 @@ namespace sio
     inline
     const message::ptr& event::get_message() const
     {
-        return m_message;
+        if(m_messages.size()>0)
+            return m_messages[0];
+        else
+        {
+            static message::ptr null_ptr;
+            return null_ptr;
+        }
+    }
+
+    inline
+    const message::list& event::get_messages() const
+    {
+        return m_messages;
     }
     
     inline
@@ -68,10 +80,19 @@ namespace sio
     }
     
     inline
-    event::event(std::string const& nsp,std::string const& name,message::ptr const& message,bool need_ack):
+    event::event(std::string const& nsp,std::string const& name,message::list&& messages,bool need_ack):
         m_nsp(nsp),
         m_name(name),
-        m_message(message),
+        m_messages(std::move(messages)),
+        m_need_ack(need_ack)
+    {
+    }
+
+    inline
+    event::event(std::string const& nsp,std::string const& name,message::list const& messages,bool need_ack):
+        m_nsp(nsp),
+        m_name(name),
+        m_messages(messages),
         m_need_ack(need_ack)
     {
     }
@@ -133,7 +154,7 @@ namespace sio
     private:
         
         // Message Parsing callbacks.
-        void on_socketio_event(const std::string& nsp, int msgId,const std::string& name, message::ptr const& message);
+        void on_socketio_event(const std::string& nsp, int msgId,const std::string& name, message::list&& message);
         void on_socketio_ack(int msgId, message::ptr const& message);
         void on_socketio_error(message::ptr const& err_message);
         
@@ -359,12 +380,12 @@ namespace sio
                     if(array_ptr->get_vector().size() >= 1&&array_ptr->get_vector()[0]->get_flag() == message::flag_string)
                     {
                         const string_message* name_ptr = static_cast<const string_message*>(array_ptr->get_vector()[0].get());
-                        message::ptr value_ptr;
-                        if(array_ptr->get_vector().size()>1)
+                        message::list mlist;
+                        for(size_t i = 1;i<array_ptr->get_vector().size();++i)
                         {
-                            value_ptr = array_ptr->get_vector()[1];
+                            mlist.push(array_ptr->get_vector()[i]);
                         }
-                        this->on_socketio_event(p.get_nsp(), p.get_pack_id(),name_ptr->get_string(), value_ptr);
+                        this->on_socketio_event(p.get_nsp(), p.get_pack_id(),name_ptr->get_string(), std::move(mlist));
                     }
                 }
 
@@ -406,10 +427,10 @@ namespace sio
         }
     }
     
-    void socket::impl::on_socketio_event(const std::string& nsp,int msgId,const std::string& name, message::ptr const& message)
+    void socket::impl::on_socketio_event(const std::string& nsp,int msgId,const std::string& name, message::list && message)
     {
         bool needAck = msgId >= 0;
-        event ev = event_adapter::create_event(nsp,name, message,needAck);
+        event ev = event_adapter::create_event(nsp,name, std::move(message),needAck);
         event_listener func = this->get_bind_listener_locked(name);
         if(func)func(ev);
         if(needAck)
diff --git a/src/sio_socket.h b/src/sio_socket.h
@@ -14,6 +14,8 @@ namespace sio
         const std::string& get_name() const;
         
         const message::ptr& get_message() const;
+
+        const message::list& get_messages() const;
         
         bool need_ack() const;
         
@@ -22,14 +24,15 @@ namespace sio
         message::ptr const& get_ack_message() const;
         
     protected:
-        event(std::string const& nsp,std::string const& name,message::ptr const& message,bool need_ack);
-        
+        event(std::string const& nsp,std::string const& name,message::list const& messages,bool need_ack);
+        event(std::string const& nsp,std::string const& name,message::list&& messages,bool need_ack);
+
         message::ptr& get_ack_message_impl();
         
     private:
         const std::string m_nsp;
         const std::string m_name;
-        const message::ptr m_message;
+        const message::list m_messages;
         const bool m_need_ack;
         message::ptr m_ack_message;
         
diff --git a/test/sio_test.cpp b/test/sio_test.cpp
@@ -107,8 +107,8 @@ BOOST_AUTO_TEST_CASE( test_packet_accept_4 )
     std::string json = payload.substr(json_start);
     nlohmann::json j = nlohmann::json::parse(json);
     BOOST_CHECK_MESSAGE(j["desc"].get<std::string>() == "Bin of 100 bytes", std::string("outputing payload desc:") + j["desc"].get<std::string>());
-    BOOST_CHECK_MESSAGE(j["bin1"]["_placeholder"] == true , std::string("outputing payload bin1:") + j["bin1"].dump());
-    BOOST_CHECK_MESSAGE(j["bin2"]["_placeholder"] == true , std::string("outputing payload bin2:") + j["bin2"].dump());
+    BOOST_CHECK_MESSAGE((bool)j["bin1"]["_placeholder"] , std::string("outputing payload bin1:") + j["bin1"].dump());
+    BOOST_CHECK_MESSAGE((bool)j["bin2"]["_placeholder"] , std::string("outputing payload bin2:") + j["bin2"].dump());
     int bin1Num = j["bin1"]["num"].get<int>();
     char numchar[] = {0,0};
     numchar[0] = bin1Num+'0';

Original file line number	Diff line number	Diff line change
`@@ -240,6 +240,18 @@ namespace sio`
`240`	`240`	`{`
`241`	`241`	`}`
`242`	`242`
	`243`	`+ list(message::list&& rhs):`
	`244`	`+ m_vector(std::move(rhs.m_vector))`
	`245`	`+ {`
	`246`	`+`
	`247`	`+ }`
	`248`	`+`
	`249`	`+ list(message::list const& rhs):`
	`250`	`+ m_vector(rhs.m_vector)`
	`251`	`+ {`
	`252`	`+`
	`253`	`+ }`
	`254`	`+`
`243`	`255`	`list(message::ptr const& message)`
`244`	`256`	`{`
`245`	`257`	`if(message)`
`@@ -285,6 +297,11 @@ namespace sio`
`285`	`297`	`return m_vector[i];`
`286`	`298`	`}`
`287`	`299`
	`300`	`+ const message::ptr& operator[] (size_t i) const`
	`301`	`+ {`
	`302`	`+ return m_vector[i];`
	`303`	`+ }`
	`304`	`+`
`288`	`305`	`message::ptr to_array_message(string const& event_name) const`
`289`	`306`	`{`
`290`	`307`	`message::ptr arr = array_message::create();`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ namespace sio`
`30`	`30`	`return std::bind(&event_adapter::adapt_func, func,std::placeholders::_1);`
`31`	`31`	`}`
`32`	`32`
`33`		`- static inline event create_event(std::string const& nsp,std::string const& name,message::ptr const& message,bool need_ack)`
	`33`	`+ static inline event create_event(std::string const& nsp,std::string const& name,message::list&& message,bool need_ack)`
`34`	`34`	`{`
`35`	`35`	`return event(nsp,name,message,need_ack);`
`36`	`36`	`}`
`@@ -51,7 +51,19 @@ namespace sio`
`51`	`51`	`inline`
`52`	`52`	`const message::ptr& event::get_message() const`
`53`	`53`	`{`
`54`		`- return m_message;`
	`54`	`+ if(m_messages.size()>0)`
	`55`	`+ return m_messages[0];`
	`56`	`+ else`
	`57`	`+ {`
	`58`	`+ static message::ptr null_ptr;`
	`59`	`+ return null_ptr;`
	`60`	`+ }`
	`61`	`+ }`
	`62`	`+`
	`63`	`+ inline`
	`64`	`+ const message::list& event::get_messages() const`
	`65`	`+ {`
	`66`	`+ return m_messages;`
`55`	`67`	`}`
`56`	`68`
`57`	`69`	`inline`
`@@ -68,10 +80,19 @@ namespace sio`
`68`	`80`	`}`
`69`	`81`
`70`	`82`	`inline`
`71`		`- event::event(std::string const& nsp,std::string const& name,message::ptr const& message,bool need_ack):`
	`83`	`+ event::event(std::string const& nsp,std::string const& name,message::list&& messages,bool need_ack):`
`72`	`84`	`m_nsp(nsp),`
`73`	`85`	`m_name(name),`
`74`		`- m_message(message),`
	`86`	`+ m_messages(std::move(messages)),`
	`87`	`+ m_need_ack(need_ack)`
	`88`	`+ {`
	`89`	`+ }`
	`90`	`+`
	`91`	`+ inline`
	`92`	`+ event::event(std::string const& nsp,std::string const& name,message::list const& messages,bool need_ack):`
	`93`	`+ m_nsp(nsp),`
	`94`	`+ m_name(name),`
	`95`	`+ m_messages(messages),`
`75`	`96`	`m_need_ack(need_ack)`
`76`	`97`	`{`
`77`	`98`	`}`
`@@ -133,7 +154,7 @@ namespace sio`
`133`	`154`	`private:`
`134`	`155`
`135`	`156`	`// Message Parsing callbacks.`
`136`		`- void on_socketio_event(const std::string& nsp, int msgId,const std::string& name, message::ptr const& message);`
	`157`	`+ void on_socketio_event(const std::string& nsp, int msgId,const std::string& name, message::list&& message);`
`137`	`158`	`void on_socketio_ack(int msgId, message::ptr const& message);`
`138`	`159`	`void on_socketio_error(message::ptr const& err_message);`
`139`	`160`
`@@ -359,12 +380,12 @@ namespace sio`
`359`	`380`	`if(array_ptr->get_vector().size() >= 1&&array_ptr->get_vector()[0]->get_flag() == message::flag_string)`
`360`	`381`	`{`
`361`	`382`	`const string_message* name_ptr = static_cast<const string_message*>(array_ptr->get_vector()[0].get());`
`362`		`- message::ptr value_ptr;`
`363`		`- if(array_ptr->get_vector().size()>1)`
	`383`	`+ message::list mlist;`
	`384`	`+ for(size_t i = 1;i<array_ptr->get_vector().size();++i)`
`364`	`385`	`{`
`365`		`- value_ptr = array_ptr->get_vector()[1];`
	`386`	`+ mlist.push(array_ptr->get_vector()[i]);`
`366`	`387`	`}`
`367`		`- this->on_socketio_event(p.get_nsp(), p.get_pack_id(),name_ptr->get_string(), value_ptr);`
	`388`	`+ this->on_socketio_event(p.get_nsp(), p.get_pack_id(),name_ptr->get_string(), std::move(mlist));`
`368`	`389`	`}`
`369`	`390`	`}`
`370`	`391`
`@@ -406,10 +427,10 @@ namespace sio`
`406`	`427`	`}`
`407`	`428`	`}`
`408`	`429`
`409`		`- void socket::impl::on_socketio_event(const std::string& nsp,int msgId,const std::string& name, message::ptr const& message)`
	`430`	`+ void socket::impl::on_socketio_event(const std::string& nsp,int msgId,const std::string& name, message::list && message)`
`410`	`431`	`{`
`411`	`432`	`bool needAck = msgId >= 0;`
`412`		`- event ev = event_adapter::create_event(nsp,name, message,needAck);`
	`433`	`+ event ev = event_adapter::create_event(nsp,name, std::move(message),needAck);`
`413`	`434`	`event_listener func = this->get_bind_listener_locked(name);`
`414`	`435`	`if(func)func(ev);`
`415`	`436`	`if(needAck)`