X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1cde906ff21eb6a3dd34cce742b544e1ddcb8994..a7e43e12dc127d32bd590722dd4118e045d0f316:/src/gras/Virtu/sg_process.c diff --git a/src/gras/Virtu/sg_process.c b/src/gras/Virtu/sg_process.c index 1ecbf3e2e4..1ea5b265f3 100644 --- a/src/gras/Virtu/sg_process.c +++ b/src/gras/Virtu/sg_process.c @@ -1,8 +1,7 @@ -/* $Id$ */ - /* process_sg - GRAS process handling on simulator */ -/* Copyright (c) 2003, 2004 Martin Quinson. All rights reserved. */ +/* Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010. The SimGrid Team. + * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -13,19 +12,24 @@ #include "gras/Virtu/virtu_sg.h" #include "gras/Msg/msg_interface.h" /* For some checks at simulation end */ #include "gras/Transport/transport_interface.h" /* For some checks at simulation end */ - +#if HAVE_LUA +#include +#include +#include +#endif XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(gras_virtu_process); 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); } /* ************************************************************************** @@ -35,27 +39,26 @@ void gras_agent_spawn(const char *name, void *data, 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(); @@ -64,53 +67,58 @@ void gras_process_init() 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); } @@ -129,21 +137,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 *) 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); } @@ -151,9 +159,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(SIMIX_req_process_get_properties + (SIMIX_process_self()), name); } /** @brief retrieve the process properties dictionnary @@ -161,41 +168,21 @@ 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 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_host_self()) - 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; } @@ -203,18 +190,19 @@ 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())), - 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())); } /* ************************************************************************** @@ -241,34 +229,18 @@ void gras_function_register(const char *name, xbt_main_func_t code) SIMIX_function_register(name, code); } -void gras_main() +void gras_function_register_default(xbt_main_func_t code) { - smx_action_t action; - xbt_fifo_t actions_done = xbt_fifo_new(); - xbt_fifo_t actions_failed = xbt_fifo_new(); + SIMIX_function_register_default(code); +} +void gras_main() +{ /* Clean IO before the run */ fflush(stdout); fflush(stderr); - SIMIX_init(); - - while (SIMIX_solve(actions_done, actions_failed) != -1.0) { - while ((action = xbt_fifo_pop(actions_failed))) { - DEBUG1("** %s failed **", SIMIX_action_get_name(action)); - SIMIX_action_signal_all (action); - /* action finished, destroy it */ - // SIMIX_action_destroy(action); - } + SIMIX_run(); - while ((action = xbt_fifo_pop(actions_done))) { - DEBUG1("** %s done **", SIMIX_action_get_name(action)); - SIMIX_action_signal_all (action); - /* action finished, destroy it */ - //SIMIX_action_destroy(action); - } - } - xbt_fifo_free(actions_failed); - xbt_fifo_free(actions_done); return; } @@ -277,6 +249,23 @@ void gras_launch_application(const char *file) SIMIX_launch_application(file); } +void gras_load_environment_script(const char *script_file) +{ +#ifdef HAVE_LUA + 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; + } +#else + xbt_die + ("Lua is not available!! to call gras_load_environment_script, lua should be available..."); +#endif + return; +} + void gras_clean() { SIMIX_clean();