X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c5ad8ca1a68bbaa9152471c8d0eeb99d762f0d86..621e3b159443376a40ff174a1a30815bf265c0ac:/src/gras/Virtu/sg_process.c diff --git a/src/gras/Virtu/sg_process.c b/src/gras/Virtu/sg_process.c index 781ab579f2..b5244179d0 100644 --- a/src/gras/Virtu/sg_process.c +++ b/src/gras/Virtu/sg_process.c @@ -29,7 +29,7 @@ void gras_agent_spawn(const char *name, smx_process_t process; simcall_process_create(&process, name, code, NULL, - gras_os_myname(), argc, argv, properties); + gras_os_myname(), -1.0, argc, argv, properties); } /* ************************************************************************** @@ -66,10 +66,10 @@ void gras_process_init() } 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)); XBT_VERB("Creating process '%s' (%d)", SIMIX_process_self_get_name(), gras_os_getpid()); @@ -79,7 +79,7 @@ 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_self_get_data(); @@ -105,14 +105,14 @@ void gras_process_exit() unsigned int cpt; s_gras_msg_t msg; XBT_WARN - ("process %d terminated, but %ld messages are still queued. Message list:", + ("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) { 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)); } } @@ -211,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); }