static long int PID = 1;
-void gras_agent_spawn(const char *name, void *data,
+void gras_agent_spawn(const char *name,
xbt_main_func_t code, int argc, char *argv[],
xbt_dict_t properties)
{
- SIMIX_process_create(name, code,
- data, gras_os_myname(), argc, argv, properties);
+ smx_process_t process;
+ SIMIX_req_process_create(&process, name, code, NULL,
+ gras_os_myname(), argc, argv, properties);
}
/* **************************************************************************
void gras_process_init()
{
gras_hostdata_t *hd =
- (gras_hostdata_t *) SIMIX_host_get_data(SIMIX_host_self());
+ (gras_hostdata_t *) SIMIX_host_self_get_data();
gras_procdata_t *pd = xbt_new0(gras_procdata_t, 1);
gras_trp_procdata_t trp_pd;
-
- SIMIX_process_set_data(SIMIX_process_self(), (void *) pd);
-
-
- gras_procdata_init();
+ long int pid = PID++; /* make sure the first process gets the first id */
if (!hd) {
- /* First process on this host */
+ /* First process on this host (FIXME: does not work if the SIMIX user contexts are truly parallel) */
hd = xbt_new(gras_hostdata_t, 1);
hd->refcount = 1;
hd->ports = xbt_dynar_new(sizeof(gras_sg_portrec_t), NULL);
- SIMIX_host_set_data(SIMIX_host_self(), (void *) hd);
+ SIMIX_host_self_set_data((void *) hd);
} else {
hd->refcount++;
}
+ SIMIX_process_self_set_data((void *) pd);
+ gras_procdata_init();
+
trp_pd = (gras_trp_procdata_t) gras_libdata_by_name("gras_trp");
- pd->pid = PID++;
+ pd->pid = pid;
if (SIMIX_process_self() != NULL) {
pd->ppid = gras_os_getpid();
trp_pd->msg_selectable_sockets = xbt_queue_new(0, sizeof(gras_socket_t));
- trp_pd->meas_selectable_sockets = xbt_queue_new(0, sizeof(gras_socket_t));
+ trp_pd->meas_selectable_sockets =
+ xbt_queue_new(0, sizeof(gras_socket_t));
- VERB2("Creating process '%s' (%d)",
- SIMIX_process_get_name(SIMIX_process_self()), gras_os_getpid());
+ XBT_VERB("Creating process '%s' (%d)", SIMIX_process_self_get_name(),
+ gras_os_getpid());
}
void gras_process_exit()
{
xbt_dynar_t sockets =
- ((gras_trp_procdata_t) gras_libdata_by_name("gras_trp"))->sockets;
+ ((gras_trp_procdata_t) gras_libdata_by_name("gras_trp"))->sockets;
gras_socket_t sock_iter;
unsigned int cursor;
gras_hostdata_t *hd =
- (gras_hostdata_t *) SIMIX_host_get_data(SIMIX_host_self());
+ (gras_hostdata_t *) SIMIX_host_self_get_data();
gras_procdata_t *pd =
- (gras_procdata_t *) SIMIX_process_get_data(SIMIX_process_self());
+ (gras_procdata_t *) SIMIX_req_process_get_data(SIMIX_process_self());
gras_msg_procdata_t msg_pd =
- (gras_msg_procdata_t) gras_libdata_by_name("gras_msg");
+ (gras_msg_procdata_t) gras_libdata_by_name("gras_msg");
gras_trp_procdata_t trp_pd =
- (gras_trp_procdata_t) gras_libdata_by_name("gras_trp");
+ (gras_trp_procdata_t) gras_libdata_by_name("gras_trp");
xbt_queue_free(&trp_pd->msg_selectable_sockets);
xbt_queue_free(&trp_pd->meas_selectable_sockets);
- xbt_assert0(hd, "Run gras_process_init (ie, gras_init)!!");
+ xbt_assert(hd, "Run gras_process_init (ie, gras_init)!!");
- VERB2("GRAS: Finalizing process '%s' (%d)",
- SIMIX_process_get_name(SIMIX_process_self()), gras_os_getpid());
+ XBT_VERB("GRAS: Finalizing process '%s' (%d)",
+ SIMIX_req_process_get_name(SIMIX_process_self()), gras_os_getpid());
if (xbt_dynar_length(msg_pd->msg_queue)) {
unsigned int cpt;
s_gras_msg_t msg;
- WARN2("process %d terminated, but %ld messages are still queued. Message list:",
- gras_os_getpid(),xbt_dynar_length(msg_pd->msg_queue));
- xbt_dynar_foreach(msg_pd->msg_queue,cpt, msg) {
- WARN5(" Message %s (%s) from %s@%s:%d",msg.type->name,e_gras_msg_kind_names[msg.kind],
- gras_socket_peer_proc(msg.expe),gras_socket_peer_name(msg.expe),gras_socket_peer_port(msg.expe));
+ XBT_WARN
+ ("process %d terminated, but %ld messages are still queued. Message list:",
+ gras_os_getpid(), xbt_dynar_length(msg_pd->msg_queue));
+ xbt_dynar_foreach(msg_pd->msg_queue, cpt, msg) {
+ XBT_WARN(" Message %s (%s) from %s@%s:%d", msg.type->name,
+ e_gras_msg_kind_names[msg.kind],
+ gras_socket_peer_proc(msg.expe),
+ gras_socket_peer_name(msg.expe),
+ gras_socket_peer_port(msg.expe));
}
}
/* if each process has its sockets list, we need to close them when the
process finish */
xbt_dynar_foreach(sockets, cursor, sock_iter) {
- VERB1("Closing the socket %p left open on exit. Maybe a socket leak?",
+ XBT_VERB("Closing the socket %p left open on exit. Maybe a socket leak?",
sock_iter);
gras_socket_close(sock_iter);
}
gras_procdata_t *gras_procdata_get(void)
{
gras_procdata_t *pd =
- (gras_procdata_t *) SIMIX_process_get_data(SIMIX_process_self());
+ (gras_procdata_t *) SIMIX_req_process_get_data(SIMIX_process_self());
- xbt_assert0(pd, "Run gras_process_init! (ie, gras_init)");
+ xbt_assert(pd, "Run gras_process_init! (ie, gras_init)");
return pd;
}
void *gras_libdata_by_name_from_remote(const char *name, smx_process_t p)
{
- gras_procdata_t *pd = (gras_procdata_t *) SIMIX_process_get_data(p);
+ gras_procdata_t *pd = (gras_procdata_t *) SIMIX_req_process_get_data(p);
- xbt_assert2(pd,
+ xbt_assert(pd,
"process '%s' on '%s' didn't run gras_process_init! (ie, gras_init)",
- SIMIX_process_get_name(p),
- SIMIX_host_get_name(SIMIX_process_get_host(p)));
+ SIMIX_req_process_get_name(p),
+ SIMIX_req_host_get_name(SIMIX_req_process_get_host(p)));
return gras_libdata_by_name_from_procdata(name, pd);
}
/** @brief retrieve the value of a given process property (or NULL if not defined) */
const char *gras_process_property_value(const char *name)
{
- return
- xbt_dict_get_or_null(SIMIX_process_get_properties(SIMIX_process_self()),
- name);
+ return xbt_dict_get_or_null(SIMIX_req_process_get_properties
+ (SIMIX_process_self()), name);
}
/** @brief retrieve the process properties dictionnary
*/
xbt_dict_t gras_process_properties(void)
{
- return SIMIX_process_get_properties(SIMIX_process_self());
+ return SIMIX_req_process_get_properties(SIMIX_process_self());
}
/* **************************************************************************
* OS virtualization function
* **************************************************************************/
-const char *xbt_procname(void)
-{
- smx_process_t process = SIMIX_process_self();
- /*FIXME: maestro used not have a simix process, now it does so
- SIMIX_process_self will return something different to NULL. This breaks
- the old xbt_log logic that assumed that NULL was equivalent to maestro,
- thus when printing it searches for maestro host name (which doesn't exists)
- and breaks the logging.
- As a hack we check for maestro by looking to the assigned host, if it is
- NULL then we are sure is maestro
- */
- if (process != NULL && SIMIX_process_get_host(process))
- return SIMIX_process_get_name(process);
-
- return "";
-}
int gras_os_getpid(void)
{
gras_procdata_t *data;
- smx_process_t process = SIMIX_process_self();
-
- if (process != NULL){
- data = (gras_procdata_t *)SIMIX_process_get_data(process);
- if(data != NULL)
- return data->pid;
- }
-
+ data = (gras_procdata_t *) SIMIX_process_self_get_data();
+ if (data != NULL)
+ return data->pid;
+
return 0;
}
const char *gras_os_host_property_value(const char *name)
{
return
- xbt_dict_get_or_null(SIMIX_host_get_properties
- (SIMIX_process_get_host(SIMIX_process_self())),
- name);
+ xbt_dict_get_or_null(SIMIX_req_host_get_properties
+ (SIMIX_req_process_get_host(SIMIX_process_self())),
+ name);
}
-/** @brief retrieve the host properties dictionnary
+/** @brief retrieve the host properties dictionary
* @warning it's the original one, not a copy. Don't mess with it
*/
xbt_dict_t gras_os_host_properties(void)
{
return
- SIMIX_host_get_properties(SIMIX_process_get_host(SIMIX_process_self()));
+ SIMIX_req_host_get_properties(SIMIX_req_process_get_host
+ (SIMIX_process_self()));
}
/* **************************************************************************
/* Clean IO before the run */
fflush(stdout);
fflush(stderr);
- SIMIX_init();
+ SIMIX_run();
- while (SIMIX_solve(NULL, NULL) != -1.0);
-
return;
}
SIMIX_launch_application(file);
}
-void gras_load_environment_script(const char* script_file)
+void gras_load_environment_script(const char *script_file)
{
#ifdef HAVE_LUA
- lua_State *L = lua_open();
- luaL_openlibs(L);
+ lua_State *L = lua_open();
+ luaL_openlibs(L);
- if (luaL_loadfile(L, script_file) || lua_pcall(L, 0, 0, 0)) {
- printf("error: %s\n", lua_tostring(L, -1));
- return;
- }
+ if (luaL_loadfile(L, script_file) || lua_pcall(L, 0, 0, 0)) {
+ printf("error: %s\n", lua_tostring(L, -1));
+ return;
+ }
#else
- xbt_die("Lua is not available!! to call gras_load_environment_script, lua should be available...");
+ xbt_die
+ ("Lua is not available!! to call gras_load_environment_script, lua should be available...");
#endif
- return;
+ return;
}
void gras_clean()
