get_status returns a Process::Status object

eventmachine · Feb 11, 2009 · fb11a41 · fb11a41
1 parent ee1843e
commit fb11a41
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 9 deletions.
diff --git a/ext/cmain.cpp b/ext/cmain.cpp
@@ -310,9 +310,13 @@ evma_get_subprocess_pid
 extern "C" int evma_get_subprocess_pid (const char *binding, pid_t *pid)
 {
 	ensure_eventmachine("evma_get_subprocess_pid");
-	EventableDescriptor *ed = dynamic_cast <EventableDescriptor*> (Bindable_t::GetObject (binding));
+	PipeDescriptor *pd = dynamic_cast <PipeDescriptor*> (Bindable_t::GetObject (binding));
-	if (ed) {
+	if (pd) {
-		return ed->GetSubprocessPid (pid) ? 1 : 0;
+		return pd->GetSubprocessPid (pid) ? 1 : 0;
+	}
+	else if (pid && EventMachine->SubprocessPid) {
+		*pid = EventMachine->SubprocessPid;
+		return 1;
 	}
 	else
 		return 0;

diff --git a/ext/em.h b/ext/em.h
@@ -89,6 +89,7 @@ class EventMachine_t
 		static void SetuidString (const char*);
 		static int SetRlimitNofile (int);
 
+		pid_t SubprocessPid;
 		int SubprocessExitStatus;
 
 		// Temporary:

diff --git a/ext/pipe.cpp b/ext/pipe.cpp
@@ -94,6 +94,9 @@ PipeDescriptor::~PipeDescriptor()
 
 	assert (MyEventMachine);
 
+	/* Another hack to make the SubprocessPid available to get_subprocess_status */
+	MyEventMachine->SubprocessPid = SubprocessPid;
+
 	// check if the process is already dead
 	if (waitpid (SubprocessPid, &(MyEventMachine->SubprocessExitStatus), WNOHANG) == 0) {
 		kill (SubprocessPid, SIGTERM);

diff --git a/ext/rubymain.cpp b/ext/rubymain.cpp
@@ -42,6 +42,8 @@ static VALUE Intern_receive_data;
 static VALUE Intern_notify_readable;
 static VALUE Intern_notify_writable;
 
+static VALUE rb_cProcStatus;
+
 /****************
 t_event_callback
 ****************/
@@ -242,16 +244,20 @@ t_get_subprocess_status
 
 static VALUE t_get_subprocess_status (VALUE self, VALUE signature)
 {
+	VALUE proc_status = Qnil;
+
 	int status;
+	pid_t pid;
+
 	if (evma_get_subprocess_status (StringValuePtr (signature), &status)) {
-#ifdef WEXITSTATUS
+		if (evma_get_subprocess_pid (StringValuePtr (signature), &pid)) {
-		return INT2NUM (WEXITSTATUS(status));
+			proc_status = rb_obj_alloc(rb_cProcStatus);
-#else
+			rb_iv_set(proc_status, "status", INT2FIX(status));
-		return INT2NUM (status);
+			rb_iv_set(proc_status, "pid", INT2FIX(pid));
-#endif
+		}
 	}
 
-	return Qnil;
+	return proc_status;
 }
 
 /*****************************
@@ -644,6 +650,10 @@ Init_rubyeventmachine
 
 extern "C" void Init_rubyeventmachine()
 {
+	// Lookup Process::Status for get_subprocess_status
+	VALUE rb_mProcess = rb_const_get(rb_cObject, rb_intern("Process"));
+	rb_cProcStatus = rb_const_get(rb_mProcess, rb_intern("Status"));
+
 	// Tuck away some symbol values so we don't have to look 'em up every time we need 'em.
 	Intern_at_signature = rb_intern ("@signature");
 	Intern_at_timers = rb_intern ("@timers");