Changeset 18476 for lang/c/mpio/trunk/mp/multiplex_impl.pre.h

Timestamp:

08/30/08 15:15:48 (4 months ago)

Author:

frsyuki

Message:

lang/c/mpio: added mp::iothreads::reader and mp::iothreads::writer

Files:

• lang/c/mpio/trunk/mp/multiplex_impl.pre.h (modified) (6 diffs)

lang/c/mpio/trunk/mp/multiplex_impl.pre.h

@@ -57 +57 @@
 manager::cb_t::cb_t(handler* h, short ev) :
         m_handler(h), m_event(ev),
-        m_wbuffer(NULL), m_allocated(0), m_used(0) {}
+        m_wbuffer((char*)malloc(2048)), m_allocated(2048), m_used(0)
+{
+        if(!m_wbuffer) { throw std::bad_alloc(); }
+}
 
 manager::cb_t::~cb_t()
@@ -98 +101 @@
                 m_used = 0;
         } else {
-                std::memmove(m_wbuffer, m_wbuffer+len, len);
+                std::memmove(m_wbuffer, m_wbuffer+len, m_used-len);
         }
 }
@@ -169 +172 @@
 void manager::send_data_impl(int fd, const char* buf, size_t len)
 {
-        m_ev.data(fd).append_buffer(buf, len);
+        cb_t& cb( m_ev.data(fd) );
+        cb.append_buffer(buf, len);
+        m_wswitch_ctx.push_back(&cb);
 }
 
@@ -196 +201 @@
         while(!m_end_flag) {
                 while( m_ev.next(&fd, &event, &pcb) ) {
-                        for(wswitch_ctx_t::iterator it(m_wswitch_ctx.begin()), it_end(m_wswitch_ctx.end());
-                                        it != it_end;
-                                        ++it) {
-                                if( try_write(*pcb) ) {
-                                        wswitch(*pcb);
-                                }
-                        }
-                        m_wswitch_ctx.clear();
                         if( event & EV_READ ) {
                                 try_read(*pcb);
@@ -211 +208 @@
                         }
                 }
+                for(wswitch_ctx_t::iterator it(m_wswitch_ctx.begin()), it_end(m_wswitch_ctx.end());
+                                it != it_end;
+                                ++it) {
+                        if( try_write(*pcb) ) {
+                                wswitch(*pcb);
+                        }
+                }
+                m_wswitch_ctx.clear();
                 if( (ret = m_ev.wait()) < 0 ) { return ret; }
         }
@@ -229 +234 @@
 bool manager::try_write(cb_t& cb)
 {
+        if(cb.length() == 0) { return false; }
         ssize_t len = ::write(cb.get().fd(), cb.wbuffer(), cb.length());
         if(len < 0) {