Changeset 21438 for lang/c

Timestamp:

10/16/08 22:06:44 (5 years ago)

Author:

frsyuki

Message:

lang/c/mpio: mp::iothreads::writer: improved exception safety

Location:

lang/c/mpio/trunk

Files:

• mp/iothreads/writer.h (modified) (3 diffs)
• mp/zone.pre.h (modified) (3 diffs)
• mp/zone_impl.pre.h (modified) (2 diffs)
• src/iothreads_writer.cc (modified) (4 diffs)

lang/c/mpio/trunk/mp/iothreads/writer.h

@@ -54 +54 @@
         static void send_datav(int fd, const struct iovec* vb, const reqvec* vr, size_t count);
 
+        static void send_datav(int fd, const struct iovec* vb, size_t count, mp::zone& zone, bool thread_safe = false);
+
 private:
         static void send_data_real(int fd, const void* buf, size_t buflen, finalize_t finalize,
@@ -101 +103 @@
         } catch (...) { delete x; throw; }
 
-        try {
-                writer::send_data_real(fd, buf, buflen,
-                                &writer::finalize_delete<mp::zone>,
-                                reinterpret_cast<void*>(x), thread_safe);
-        } catch (...) {
-                try {
-                        x->delegate_to(z);
-                } catch (...) { delete x; throw; }
-                delete x; throw;
-        }
+        writer::send_data_real(fd, buf, buflen,
+                        &writer::finalize_delete<mp::zone>,
+                        reinterpret_cast<void*>(x), thread_safe);
 }
 
@@ -138 +133 @@
 }
 
+inline void send_datav(int fd, const struct iovec* vb, size_t count, mp::zone& z, bool thread_safe = false)
+{
+        writer::send_datav(fd, vb, count, z, thread_safe);
+}
+
 
 }  // namespace iothreads

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

@@ -23 +23 @@
 
 
-
 class zone {
 public:
@@ -36 +35 @@
                 T* allocate(MP_ARGS_PARAMS);
 MP_ARGS_END
+
+
+        void* malloc(size_t sz);
 
 
@@ -60 +62 @@
         T* push_object(T* x);
 
+        static void finalize_free(void* p);
+
         template <typename T>
         static void finalize_destruct_free(void* obj);

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

@@ -51 +51 @@
 {
         void (*func)(void*) = &zone::finalize_destruct_free<T>;
-        push_finalizer(func, reinterpret_cast<void*>(x));
+        try {
+                push_finalizer(func, reinterpret_cast<void*>(x));
+        } catch (...) { (*func)(x); throw; }
         return x;
+}
+
+inline void* zone::malloc(size_t sz)
+{
+        void* p = ::malloc(sz);
+        if(!p) { throw std::bad_alloc(); }
+        void (*func)(void*) = &zone::finalize_free;
+        try {
+                push_finalizer(func, p);
+        } catch (...) { (*func)(p); throw; }
+        return p;
 }
 
@@ -77 +90 @@
 }
 
+inline void zone::finalize_free(void* p)
+{
+        ::free(p);
+}
+
 template <typename T>
 void zone::finalize_destruct_free(void* obj)

lang/c/mpio/trunk/src/iothreads_writer.cc

@@ -219 +219 @@
 inline void writer::impl::send_data_real(int fd, const void* buf, size_t buflen, finalize_t finalize,
                 void* user, bool thread_safe)
-{
+try {
         if(is_empty(fd)) {
                 ssize_t wl = ::write(fd, buf, buflen);
@@ -247 +247 @@
                 add_data(fd, buf, buflen, finalize, user, thread_safe);
         }
-}
+
+} catch (...) {
+        send_data_prefailed(fd);
+        call_finalize(finalize, user);
+        throw;
+}
+
 
 
@@ -266 +272 @@
                 }
 
-                size_t i;
-                for(i=0; i < count; ++i) {
-                        if(static_cast<size_t>(wl) >= vb[i].iov_len) {
-                                wl -= vb[i].iov_len;
+                size_t i = 0;
+                try {
+                        for(; i < count; ++i) {
+                                if(static_cast<size_t>(wl) >= vb[i].iov_len) {
+                                        wl -= vb[i].iov_len;
+                                        call_finalize(vr[i].finalize, vr[i].user);
+                                } else {
+                                        add_data(fd, ((const char*)vb[i].iov_base + wl), vb[i].iov_len - wl,
+                                                        vr[i].finalize, vr[i].user, vr[i].thread_safe);
+                                        ++i;
+                                        break;
+                                }
+                        }
+        
+                        for(; i < count; ++i) {
+                                add_data(fd, vb[i].iov_base, vb[i].iov_len,
+                                                vr[i].finalize, vr[i].user, vr[i].thread_safe);
+                        }
+
+                } catch (...) {
+                        send_data_prefailed(fd);
+                        for(; i < count; ++i) {
                                 call_finalize(vr[i].finalize, vr[i].user);
-                        } else {
-                                add_data(fd, ((const char*)vb[i].iov_base + wl), vb[i].iov_len - wl,
-                                                vr[i].finalize, vr[i].user, vr[i].thread_safe);
-                                ++i;
-                                break;
-                        }
-                }
-
-                for(; i < count; ++i) {
-                        add_data(fd, vb[i].iov_base, vb[i].iov_len,
-                                        vr[i].finalize, vr[i].user, vr[i].thread_safe);
+                        }
+                        throw;
                 }
 
         } else {
 add_all:
-                for(size_t i=0; i < count; ++i) {
-                        add_data(fd, vb[i].iov_base, vb[i].iov_len,
-                                        vr[i].finalize, vr[i].user, vr[i].thread_safe);
+                size_t i = 0;
+                try {
+                        for(; i < count; ++i) {
+                                add_data(fd, vb[i].iov_base, vb[i].iov_len,
+                                                vr[i].finalize, vr[i].user, vr[i].thread_safe);
+                        }
+                } catch (...) {
+                        send_data_prefailed(fd);
+                        for(; i < count; ++i) {
+                                call_finalize(vr[i].finalize, vr[i].user);
+                        }
+                        throw;
                 }
         }
@@ -294 +318 @@
 
 clean_all:
+        send_data_prefailed(fd);
         for(size_t i=0; i < count; ++i) {
                 call_finalize(vr[i].finalize, vr[i].user);
         }
-        send_data_prefailed(fd);
-}
-
+}
+
+
+void writer::send_datav(int fd, const struct iovec* vb, size_t count, mp::zone& z, bool thread_safe)
+{
+        reqvec vr[count];
+
+        size_t i;
+        for(i=0; i < count-1; ++i) {
+                vr[i] = reqvec(&writer::finalize_nothing, NULL);
+        }
+
+        mp::zone* x = new mp::zone();
+        try {
+                z.delegate_to(*x);
+        } catch (...) { delete x; throw; }
+
+        vr[i] = reqvec(&writer::finalize_delete<mp::zone>,
+                        reinterpret_cast<void*>(x), thread_safe);
+
+        instance().send_datav(fd, vb, vr, count);
+}