Changeset 37

Timestamp:

Nov 9, 2005 3:51:49 PM (18 years ago)

Author:

bennylp

Message:

Test pj++ proactor (compile only)

Location:

pjproject/main/pjlib

Files:

• include/pj++/pool.hpp (modified) (2 diffs)
• include/pj++/proactor.hpp (modified) (10 diffs)
• src/pjlib++-test/main.cpp (modified) (2 diffs)

pjproject/main/pjlib/include/pj++/pool.hpp

@@ -16 +16 @@
 public:
     void *operator new(unsigned int class_size, Pj_Pool *pool);
-    void operator delete(void*);
-    void operator delete(void*, Pj_Pool*);
+    void *operator new(unsigned int class_size, Pj_Pool &pool);
+
+    void operator delete(void*)
+    {
+    }
+
+    void operator delete(void*, Pj_Pool*)
+    {
+    }
+
+    void operator delete(void*, Pj_Pool&)
+    {
+    }
 
     //
@@ -221 +232 @@
     return pool->alloc(class_size);
 }
-inline void Pj_Object::operator delete(void *ptr)
-{
-}
-inline void Pj_Object::operator delete(void *ptr, Pj_Pool*)
-{
+inline void *Pj_Object::operator new(unsigned int class_size, Pj_Pool &pool)
+{
+    return pool.alloc(class_size);
 }
 

pjproject/main/pjlib/include/pj++/proactor.hpp

@@ -24 +24 @@
 public:
     //
+    // Construct with null handler.
+    // App must call set_handler() before use.
+    //
+    Pj_Async_Op()
+        : handler_(NULL)
+    {
+    }
+
+    //
     // Constructor.
     //
@@ -30 +39 @@
     {
         pj_memset(this, 0, sizeof(pj_ioqueue_op_key_t));
+    }
+
+    //
+    // Set handler.
+    //
+    void set_handler(Pj_Event_Handler *handler)
+    {
+        handler_ = handler;
     }
 
@@ -98 +115 @@
 
     //
-    // Receive data.
+    // Start async receive.
     //
     pj_status_t recv( Pj_Async_Op *op_key, 
@@ -109 +126 @@
 
     //
-    // Recvfrom()
+    // Start async recvfrom()
     //
     pj_status_t recvfrom( Pj_Async_Op *op_key, 
@@ -121 +138 @@
 
     //
-    // send()
+    // Start async send()
     //
     pj_status_t send( Pj_Async_Op *op_key, 
@@ -131 +148 @@
 
     //
-    // sendto()
+    // Start async sendto()
     //
     pj_status_t sendto( Pj_Async_Op *op_key,
@@ -143 +160 @@
 #if PJ_HAS_TCP
     //
-    // connect()
+    // Start async connect()
     //
     pj_status_t connect(const Pj_Inet_Addr &addr)
@@ -151 +168 @@
 
     //
-    // accept.
+    // Start async accept().
     //
     pj_status_t accept( Pj_Async_Op *op_key,
@@ -273 +290 @@
         cb_.on_accept_complete  = &accept_complete_cb;
         cb_.on_connect_complete = &connect_complete_cb;
+
+        create(pool, max_fd, max_timer_entries);
     }
 
@@ -305 +324 @@
         }
         
-        status;
+        return status;
     }
 

pjproject/main/pjlib/src/pjlib++-test/main.cpp

@@ -9 +9 @@
 #include <pj++/timer.hpp>
 #include <pj++/tree.hpp>
+
+class My_Async_Op : public Pj_Async_Op
+{
+};
+
+class My_Event_Handler : public Pj_Event_Handler
+{
+};
 
 int main()
@@ -25 +33 @@
     delete plsem;
 
+    Pj_Proactor proactor(pool, 100, 100);
+
+    My_Event_Handler *event_handler = new(the_pool) My_Event_Handler;
+    proactor.register_socket_handler(pool, event_handler);
+    proactor.unregister_handler(event_handler);
+
     return 0;
 }