better #481

src/monitor.c

@@ -92,9 +92,24 @@ int pthreads_monitor_notify(pthreads_monitor_t *m) {
 }
 
 void pthreads_monitor_wait_until(pthreads_monitor_t *m, pthreads_monitor_state_t state) {
-	while (!pthreads_monitor_check(m, state)) {
-		pthreads_monitor_wait(m, 0);
+	if (!pthreads_monitor_lock(m)) {
+		return;
 	}
+
+	if (!pthreads_monitor_check(m, state)) {
+		if (pthreads_monitor_wait(m, 0) != 0) {
+			pthreads_monitor_unlock(m);
+			return;
+		}
+		pthreads_monitor_unlock(m);
+		pthreads_monitor_wait_until(m, state);
+	}
+
+	pthreads_monitor_unlock(m);
+}
+
+void pthreads_monitor_set(pthreads_monitor_t *m, pthreads_monitor_state_t state) {
+	m->state |= state;
 }
 
 void pthreads_monitor_add(pthreads_monitor_t *m, pthreads_monitor_state_t state) {

src/monitor.h

@@ -37,6 +37,7 @@ int pthreads_monitor_wait(pthreads_monitor_t *m, long timeout);
 int pthreads_monitor_notify(pthreads_monitor_t *m);
 void pthreads_monitor_wait_until(pthreads_monitor_t *m, pthreads_monitor_state_t state);
 void pthreads_monitor_add(pthreads_monitor_t *m, pthreads_monitor_state_t state);
+void pthreads_monitor_set(pthreads_monitor_t *m, pthreads_monitor_state_t state);
 void pthreads_monitor_remove(pthreads_monitor_t *m, pthreads_monitor_state_t state);
 void pthreads_monitor_free(pthreads_monitor_t *m);
 #endif

src/object.c

@@ -215,7 +215,7 @@ int pthreads_connect(pthreads_object_t* source, pthreads_object_t* destination)
 		destination->local.ls = source->local.ls;
 		destination->monitor = source->monitor;
 		destination->store = source->store;
-		destination->stack = source->stack;
+		destination->stack = source->stack;	
 
 		return SUCCESS;
 	} else return FAILURE;
@@ -279,8 +279,6 @@ static void pthreads_base_ctor(pthreads_object_t* base, zend_class_entry *entry)
 void pthreads_base_free(zend_object *object) {
 	pthreads_object_t* base = PTHREADS_FETCH_FROM(object);
 
-	HANDLE_BLOCK_INTERRUPTIONS();
-
 	if (PTHREADS_IS_NOT_CONNECTION(base)) {
 		if ((PTHREADS_IS_THREAD(base)||PTHREADS_IS_WORKER(base)) &&
 			!pthreads_monitor_check(base->monitor, PTHREADS_MONITOR_JOINED)) {
@@ -301,8 +299,6 @@ void pthreads_base_free(zend_object *object) {
 	zend_object_std_dtor(object);
 
 	pthreads_globals_object_delete(base);
-
-	HANDLE_UNBLOCK_INTERRUPTIONS();
 } /* }}} */
 
 /* {{{ */

src/prepare.c

@@ -575,9 +575,11 @@ static inline void pthreads_prepare_sapi(pthreads_object_t* thread) {
 #ifdef PTHREADS_KILL_SIGNAL
 static inline void pthreads_kill_handler(int signo) /* {{{ */
 {	
+	ZEND_TSRMLS_CACHE_UPDATE();
+
 	pthreads_object_t* current = PTHREADS_FETCH_FROM(Z_OBJ(PTHREADS_ZG(this)));
 
-	pthreads_monitor_add(
+	pthreads_monitor_set(
 		current->monitor, PTHREADS_MONITOR_ERROR);
 
 	PTHREADS_ZG(signal) = signo;

tests/killed-info.phpt

@@ -17,7 +17,6 @@ class Test extends Thread
 $t = new Test();
 $t->start();
 $t->kill();
-$t->join();
 
 var_dump($t->isTerminated());
 ?>