X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/76d7df91478f4647517054495744afcf0fa9b6fb..621e3b159443376a40ff174a1a30815bf265c0ac:/src/gras/Virtu/sg_process.c diff --git a/src/gras/Virtu/sg_process.c b/src/gras/Virtu/sg_process.c index 2e2ed98e57..b5244179d0 100644 --- a/src/gras/Virtu/sg_process.c +++ b/src/gras/Virtu/sg_process.c @@ -27,8 +27,9 @@ void gras_agent_spawn(const char *name, xbt_dict_t properties) { - SIMIX_process_create(name, code, NULL, - gras_os_myname(), argc, argv, properties); + smx_process_t process; + simcall_process_create(&process, name, code, NULL, + gras_os_myname(), -1.0, argc, argv, properties); } /* ************************************************************************** @@ -37,53 +38,53 @@ void gras_agent_spawn(const char *name, void gras_process_init() { + smx_process_t self = SIMIX_process_self(); 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(self, (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) { + if (self != NULL) { pd->ppid = gras_os_getpid(); } else pd->ppid = -1; - trp_pd->msg_selectable_sockets = xbt_queue_new(0, sizeof(gras_socket_t)); + trp_pd->msg_selectable_sockets = xbt_queue_new(0, sizeof(xbt_socket_t)); trp_pd->meas_selectable_sockets = - xbt_queue_new(0, sizeof(gras_socket_t)); + xbt_queue_new(0, sizeof(xbt_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_socket_t sock_iter; + xbt_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 *) simcall_process_get_data(SIMIX_process_self()); gras_msg_procdata_t msg_pd = (gras_msg_procdata_t) gras_libdata_by_name("gras_msg"); @@ -95,30 +96,30 @@ void gras_process_exit() 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)", + simcall_process_get_name(SIMIX_process_self()), gras_os_getpid()); - if (xbt_dynar_length(msg_pd->msg_queue)) { + if (!xbt_dynar_is_empty(msg_pd->msg_queue)) { unsigned int cpt; s_gras_msg_t msg; - WARN2 - ("process %d terminated, but %ld messages are still queued. Message list:", + XBT_WARN + ("process %d terminated, but %lu 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, + 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)); + xbt_socket_peer_proc(msg.expe), + xbt_socket_peer_name(msg.expe), + xbt_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); } @@ -137,21 +138,21 @@ void gras_process_exit() gras_procdata_t *gras_procdata_get(void) { gras_procdata_t *pd = - (gras_procdata_t *) SIMIX_process_get_data(SIMIX_process_self()); + (gras_procdata_t *) simcall_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 *) simcall_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))); + simcall_process_get_name(p), + simcall_host_get_name(simcall_process_get_host(p))); return gras_libdata_by_name_from_procdata(name, pd); } @@ -159,9 +160,8 @@ void *gras_libdata_by_name_from_remote(const char *name, smx_process_t p) /** @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(simcall_process_get_properties + (SIMIX_process_self()), name); } /** @brief retrieve the process properties dictionnary @@ -169,40 +169,20 @@ const char *gras_process_property_value(const char *name) */ xbt_dict_t gras_process_properties(void) { - return SIMIX_process_get_properties(SIMIX_process_self()); + return simcall_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(SIMIX_process_self()); + if (data != NULL) + return data->pid; return 0; } @@ -211,18 +191,18 @@ int gras_os_getpid(void) 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())), + xbt_dict_get_or_null(simcall_host_get_properties + (simcall_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 + simcall_host_get_properties(simcall_process_get_host (SIMIX_process_self())); } @@ -231,12 +211,8 @@ xbt_dict_t gras_os_host_properties(void) * (these functions are called by the stuff generated by gras_stub_generator) * **************************************************************************/ -XBT_LOG_EXTERNAL_CATEGORY(gras_trp); -XBT_LOG_EXTERNAL_CATEGORY(gras_trp_sg); - void gras_global_init(int *argc, char **argv) { - XBT_LOG_CONNECT(gras_trp_sg, gras_trp); SIMIX_global_init(argc, argv); } @@ -260,9 +236,7 @@ void gras_main() /* Clean IO before the run */ fflush(stdout); fflush(stderr); - SIMIX_init(); - - while (SIMIX_solve(NULL, NULL) != -1.0); + SIMIX_run(); return; }