forb: Fix deadlock in executor

[frescor/forb.git] / src / executor.c

diff --git a/src/executor.c b/src/executor.c
index d7ea4ac3d2516b3d6d8a8f40f2ba827792d6c82c..08e00680f448689f782d1b8b68cd167a3484cc96 100644 (file)
--- a/src/executor.c
+++ b/src/executor.c
@@ -58,10 +58,16 @@
 #include "object.h"
 #include <ul_log.h>
 #include <stdio.h>
+#include <pthread.h>
 
 extern UL_LOG_CUST(ulogd_forb_executor);
 
-int forb_executor_key = -1;
+static pthread_key_t forb_executor_key = -1;
+
+int forb_executor_prepare()
+{
+       return pthread_key_create(&forb_executor_key, NULL);
+}
 
 /** 
  * Initializes executor.
@@ -80,6 +86,8 @@ int forb_executor_init(forb_executor_t *executor)
        if (ret) return ret;
 
        forb_exec_req_nolock_init_head(executor);
+       
+       forb_syncobj_init(&executor->reply_processed, 0);
        return 0;
 }
 
@@ -135,31 +143,13 @@ void forb_executor_unregister_object(forb_executor_t *executor, forb_object obj)
 int forb_executor_run(forb_executor_t *executor)
 {
        int ret;
-       // for thread specific data testing
-#ifdef DEBUG_EXECUTOR
-       forb_executor_t *executor_test;
-#endif
-       
-       // initializing thread specific data (FIXME: maybe should be somewhere else)
-       if (forb_executor_key == -1) {
-               if ((ret = fosa_key_create(&forb_executor_key)))
-                       goto ret;
-       }
+
        // setting pointer to executor as thread specific data
-       if ((ret = fosa_thread_set_specific_data(forb_executor_key, 
-                                       fosa_thread_self(), executor)))         
+       if ((ret = pthread_setspecific(forb_executor_key, executor)))           
                goto ret;
-
-#ifdef DEBUG_EXECUTOR
-       printf("Executor: current executor saved: %p\n", executor);
-       forb_get_current_executor(&executor_test);
-       printf("Executor: current executor loaded: %p\n", executor_test);
-#endif
-
+       
        fosa_mutex_lock(&executor->mutex);
        while (1) {
-               fosa_cond_wait(&executor->new_request_in_empty_list,
-                              &executor->mutex);
                while (!forb_exec_req_nolock_is_empty(executor)) {
                        forb_exec_req_t *exec_req;
                        exec_req = forb_exec_req_nolock_cut_first(executor);
@@ -169,6 +159,8 @@ int forb_executor_run(forb_executor_t *executor)
 
                        fosa_mutex_lock(&executor->mutex);
                }
+               fosa_cond_wait(&executor->new_request_in_empty_list,
+                              &executor->mutex);
        }
        fosa_mutex_unlock(&executor->mutex);
 ret:   
@@ -177,6 +169,8 @@ ret:
 
 /** 
  * Convenience function for executing only one object in one executor.
+ * This function calls forb_signal_server_ready() at the appropriate
+ * place.
  * 
  * @param obj The object to execute.
  * 
@@ -191,6 +185,9 @@ int forb_execute_object(forb_object obj)
        if (ret) goto error;
        ret = forb_executor_register_object(&executor, obj);
        if (ret) goto destroy_and_error;
+
+       ret = forb_signal_server_ready(obj->orb);
+       if (ret) goto destroy_and_error;
        
        ret = forb_executor_run(&executor);
 
@@ -204,17 +201,10 @@ error:
 /**
  * Determines the executor we are currently in.
  *
- * @param executor Current executor pointer.
- *
- * @return Zero in case of success.
+ * @return Pointer to the current executor or NULL if not called
+ * within executor.
  */
-int forb_get_current_executor(forb_executor_t **executor)
+forb_executor_t *forb_get_current_executor(void)
 {
-       int ret;
-       ret = fosa_thread_get_specific_data(forb_executor_key, 
-                                           fosa_thread_self(), ((void *) executor));
-                                           
-       if (ret)
-               *executor = NULL;
-       return ret;
+       return pthread_getspecific(forb_executor_key);
 }