#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.
if (ret) return ret;
forb_exec_req_nolock_init_head(executor);
+
+ forb_syncobj_init(&executor->reply_processed, 0);
+
+ executor->finish = false;
+ fosa_cond_init(&executor->finished);
return 0;
}
/* TODO: */
}
+/**
+ * Waits for the executor to finish processing requests.
+ *
+ * @param executor
+ */
+void forb_executor_synchronize(forb_executor_t *executor)
+{
+ fosa_mutex_lock(&executor->mutex);
+ executor->finish = true;
+ fosa_cond_signal(&executor->new_request_in_empty_list);
+ fosa_cond_wait(&executor->finished, &executor->mutex);
+ fosa_mutex_unlock(&executor->mutex);
+
+}
+
/**
* Setup the object @a obj so that requests to it are executed within
* the thread of the @a executor.
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);
fosa_mutex_lock(&executor->mutex);
}
+ if (executor->finish) {
+ fosa_cond_broadcast(&executor->finished);
+ executor->finish = false;
+ }
+
+
+ fosa_cond_wait(&executor->new_request_in_empty_list,
+ &executor->mutex);
}
fosa_mutex_unlock(&executor->mutex);
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.
*
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);
/**
* 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);
}