remove running when a thread is killed

krakjoe · Sep 8, 2015 · c84403d · c84403d
1 parent 3d72793
commit c84403d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/classes/thread.h b/classes/thread.h
@@ -171,7 +171,11 @@ PHP_METHOD(Thread, kill)
     if (zend_parse_parameters_none() != SUCCESS) {
         return;
     }
-
+
+	if (!pthreads_monitor_check(thread->monitor, PTHREADS_MONITOR_STARTED)) {
+		return;
+	}
+
 	RETURN_BOOL(pthread_kill(thread->thread, PTHREADS_KILL_SIGNAL)==SUCCESS);
 } /* }}} */
 

diff --git a/src/object.c b/src/object.c
@@ -409,15 +409,16 @@ static inline zend_bool pthreads_routine_run_function(pthreads_object_t* object,
 				call.fcc.calling_scope = connection->std.ce;
 				call.fcc.called_scope = connection->std.ce;
 				call.fcc.function_handler = run;
-			
+
 				zend_call_function(&call.fci, &call.fcc);
 			}
 		}
 	} zend_catch {
 	    pthreads_monitor_add(object->monitor, PTHREADS_MONITOR_ERROR);		
 
 	    if (PTHREADS_ZG(signal) == PTHREADS_KILL_SIGNAL) {
-		    /* like, totally bail man ! */
+			pthreads_monitor_remove(
+				object->monitor, PTHREADS_MONITOR_RUNNING);
 		    zend_bailout();
 	    }
 	} zend_end_try();