static void *
forb_execution_thread(void *arg)
{
- forb_orb orb = arg;
-
- forb_execute_object(orb);
+ forb_executor_t *executor = arg;
+ forb_executor_run(executor);
return NULL;
}
* can accept remote request to our new ORB. */
forb_objects_nolock_insert(forb, orb);
+ ret = forb_executor_init(&forb->default_executor);
+ if (ret) goto err2;
+ ret = forb_executor_register_object(&forb->default_executor, orb);
+ if (ret) goto err3;
+
ret = fosa_thread_create(&forb->execution_thread, NULL,
- forb_execution_thread, orb);
+ forb_execution_thread, &forb->default_executor);
if (ret != 0)
- goto err2;
+ goto err3;
/* FIXME: I do not know how to deregister the exit handler if
* forb_destroy() is called manually. */
}
err_free_unix:
free(port);
- goto err2;
+ goto err3;
unix_ok:;
}
#endif
}
err_free_inet:
free(port);
- goto err2;
+ goto err3;
inet_ok:;
hack_register_fcb(orb, port);
}
#endif
return orb;
+err3: forb_executor_destroy(&forb->default_executor);
err2: forb_free(forb);
err: return NULL;
}
forb_t *forb = forb_object_to_forb(orb);
forb_port_t *port;
forb_regref_t *regref;
+ forb_object obj;
+
+ /* Stop ports to prevent remote requests from coming */
+ ul_list_for_each(forb_port, forb, port) {
+ forb_stop_port(port);
+ }
+
+ /* Wait for executors to finish all requests (and thus drop
+ * all references to peers). This is very inefficient for big
+ * number of objects, but we do not care */
+ gavl_cust_for_each(forb_objects_nolock, forb, obj) {
+ forb_executor_t *executor;
+ executor = forb_object_get_executor(obj);
+ if (executor)
+ forb_executor_synchronize(executor);
+ }
+
+ /* Destroy ports - this should drop all remaining references
+ * to peers and result in closing of all remote
+ * connections. */
+ ul_list_for_each_cut(forb_port, forb, port) {
+ forb_destroy_port(port);
+ }
pthread_cancel(forb->execution_thread.pthread_id);
pthread_join(forb->execution_thread.pthread_id, NULL);
forb_unregister_reference(orb, regref->name.str);
}
- ul_list_for_each_cut(forb_port, forb, port) {
- forb_destroy_port(port);
- }
forb_object_release(orb);
forb_free(forb);
}