]> rtime.felk.cvut.cz Git - frescor/forb.git/blobdiff - src/executor.c
Merge branch 'master' of rtime.felk.cvut.cz:/frescor/frsh-forb
[frescor/forb.git] / src / executor.c
index 8c9229a3f78dc4473aefb8b98fb8cb30864dd980..7af1923975a17d4e479a24ddbbb21c66ae4f1816 100644 (file)
 #include "exec_req.h"
 #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.
@@ -79,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;
 }
 
@@ -134,15 +143,9 @@ void forb_executor_unregister_object(forb_executor_t *executor, forb_object obj)
 int forb_executor_run(forb_executor_t *executor)
 {
        int ret;
-       
-       // 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(), (void *) executor))         
+       if ((ret = pthread_setspecific(forb_executor_key, executor)))           
                goto ret;
        
        fosa_mutex_lock(&executor->mutex);
@@ -193,14 +196,10 @@ error:
 /**
  * Determines the executor we are currently in.
  *
- * @param executor Current executor.
- *
- * @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(), &executor);
-       return ret;
+       return pthread_getspecific(forb_executor_key);
 }