/********************************* Process ************************************/
XBT_PUBLIC(void) SIMIX_process_cleanup(smx_process_t arg);
XBT_PUBLIC(int) SIMIX_process_count(void);
-XBT_PUBLIC(smx_process_t) SIMIX_process_self(void);
+XBT_INLINE XBT_PUBLIC(smx_process_t) SIMIX_process_self(void);
XBT_PUBLIC(const char*) SIMIX_process_self_get_name(void);
XBT_PUBLIC(void) SIMIX_process_self_set_data(void *data);
XBT_PUBLIC(void*) SIMIX_process_self_get_data(void);
XBT_PUBLIC(unsigned int) SIMIX_req_sem_acquire_any(xbt_dynar_t sems);
XBT_PUBLIC(int) SIMIX_req_sem_get_capacity(smx_sem_t sem);
-/* functions to let the state machine context factory mess with simix flow */
-XBT_PUBLIC(void*) SIMIX_request_get_result(int id);
-XBT_PUBLIC(int) SIMIX_request_last_id(void);
+const char *SIMIX_request_name(int kind);
SG_END_DECL()
#endif /* _SIMIX_SIMIX_H */