Changeset 591

Timestamp:

11/27/07 02:27:32 (1 year ago)

Author:

blackhedd

Message:

added visibility to subprocess status for popen

Files:

• version_0/ext/cmain.cpp (modified) (1 diff)
• version_0/ext/ed.h (modified) (3 diffs)
• version_0/ext/eventmachine.h (modified) (1 diff)
• version_0/ext/pipe.cpp (modified) (3 diffs)
• version_0/ext/rubymain.cpp (modified) (2 diffs)
• version_0/lib/eventmachine.rb (modified) (1 diff)

version_0/ext/cmain.cpp

@@ -271 +271 @@
-        if (ed) {
-                return ed->GetSubprocessPid (pid) ? 1 : 0;
+        }
+        else
+                return 0;
+}
+
+/**************************
+evma_get_subprocess_status
+**************************/
+
+extern "C" int evma_get_subprocess_status (const char *binding, int *status)
+{
+        if (!EventMachine)
+                throw std::runtime_error ("not initialized");
+        EventableDescriptor *ed = dynamic_cast <EventableDescriptor*> (Bindable_t::GetObject (binding));
+        if (ed) {
+                return ed->GetSubprocessStatus (status) ? 1 : 0;
-        }
-        else

version_0/ext/ed.h

@@ -64 +64 @@
-                virtual bool GetPeername (struct sockaddr*) {return false;}
-                virtual bool GetSubprocessPid (pid_t*) {return false;}
+                virtual bool GetSubprocessStatus (int*) {return false;}
-
-                virtual void StartTls() {}
@@ -290 +291 @@
-
-                virtual bool GetSubprocessPid (pid_t*);
+                virtual bool GetSubprocessStatus (int*);
-
-        protected:
@@ -309 +311 @@
-
-                pid_t SubprocessPid;
+                int SubprocessStatus;
-
-        private:

version_0/ext/eventmachine.h

@@ -49 +49 @@
-        int evma_get_peername (const char *binding, struct sockaddr*);
-        int evma_get_subprocess_pid (const char *binding, pid_t*);
+        int evma_get_subprocess_status (const char *binding, int*);
-        int evma_send_data_to_connection (const char *binding, const char *data, int data_length);
-        int evma_send_datagram (const char *binding, const char *data, int data_length, const char *address, int port);

version_0/ext/pipe.cpp

@@ -34 +34 @@
-        InactivityTimeout (0),
-        OutboundDataSize (0),
-
+
+
-{
-        #ifdef HAVE_EPOLL
@@ -77 +78 @@
-        kill (SubprocessPid, SIGTERM);
-        nanosleep (&req, NULL);
-NULL
+&SubprocessStatus
-                kill (SubprocessPid, SIGKILL);
-                nanosleep (&req, NULL);
-NULL
+&SubprocessStatus
-                        throw std::runtime_error ("unable to reap subprocess");
-        }
@@ -303 +304 @@
-}
-
+/***********************************
+PipeDescriptor::GetSubprocessStatus
+***********************************/
+
+bool PipeDescriptor::GetSubprocessStatus (int *status)
+{
+        bool ok = false;
+        if (status) {
+                *status = SubprocessStatus;
+                ok = true;
+        }
+        return ok;
+}
+
-#endif // OS_UNIX
-

version_0/ext/rubymain.cpp

@@ -177 +177 @@
-        if (evma_get_subprocess_pid (StringValuePtr (signature), &pid)) {
-                return INT2NUM (pid);
+        }
+
+        return Qnil;
+}
+
+/***********************
+t_get_subprocess_status
+***********************/
+
+static VALUE t_get_subprocess_status (VALUE self, VALUE signature)
+{
+        int status;
+        if (evma_get_subprocess_status (StringValuePtr (signature), &status)) {
+                return INT2NUM (status);
-        }
-
@@ -526 +540 @@
-        rb_define_module_function (EmModule, "get_peername", (VALUE(*)(...))t_get_peername, 1);
-        rb_define_module_function (EmModule, "get_subprocess_pid", (VALUE(*)(...))t_get_subprocess_pid, 1);
+        rb_define_module_function (EmModule, "get_subprocess_status", (VALUE(*)(...))t_get_subprocess_status, 1);
-        rb_define_module_function (EmModule, "get_comm_inactivity_timeout", (VALUE(*)(...))t_get_comm_inactivity_timeout, 1);
-        rb_define_module_function (EmModule, "set_comm_inactivity_timeout", (VALUE(*)(...))t_set_comm_inactivity_timeout, 2);

version_0/lib/eventmachine.rb

@@ -1430 +1430 @@
-        end
-
+        # Returns a subprocess exit status. Only useful for #popen. Call it in your
+        # #unbind handler.
+        #
+        def get_status
+                EventMachine::get_subprocess_status @signature
+        end
+
-        # comm_inactivity_timeout returns the current value (in seconds) of the inactivity-timeout
-        # property of network-connection and datagram-socket objects. A nonzero value