X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b1acf7fe2f1886e9adcb4313f53548c9995a906c..61e745a2f451d107f45d7c5cb8b2e48648330c4e:/src/gras/Virtu/sg_process.c diff --git a/src/gras/Virtu/sg_process.c b/src/gras/Virtu/sg_process.c index ae0056dc35..0c51c0e452 100644 --- a/src/gras/Virtu/sg_process.c +++ b/src/gras/Virtu/sg_process.c @@ -2,98 +2,109 @@ /* process_sg - GRAS process handling on simulator */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2003,2004 da GRAS posse. */ +/* Copyright (c) 2003, 2004 Martin Quinson. 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. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ -#include "Virtu/virtu_sg.h" +#include "gras_modinter.h" /* module initialization interface */ +#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 */ -GRAS_LOG_NEW_DEFAULT_SUBCATEGORY(process,GRAS); +XBT_LOG_EXTERNAL_CATEGORY(process); +XBT_LOG_DEFAULT_CATEGORY(process); -gras_error_t +xbt_error_t gras_process_init() { - gras_error_t errcode; + xbt_error_t errcode; gras_hostdata_t *hd=(gras_hostdata_t *)MSG_host_get_data(MSG_host_self()); - gras_procdata_t *pd; + gras_procdata_t *pd=xbt_new(gras_procdata_t,1); + gras_trp_procdata_t trp_pd; + gras_sg_portrec_t prraw,pr; int i; - if (!(pd=(gras_procdata_t *)malloc(sizeof(gras_procdata_t)))) - RAISE_MALLOC; - - if (MSG_process_set_data(MSG_process_self(),(void*)pd) != MSG_OK) { + if (MSG_process_set_data(MSG_process_self(),(void*)pd) != MSG_OK) return unknown_error; - } - TRY(gras_procdata_init()); + + gras_procdata_init(); if (!hd) { - if (!(hd=(gras_hostdata_t *)malloc(sizeof(gras_hostdata_t)))) - RAISE_MALLOC; - - hd->portLen = 0; - hd->port=NULL; - hd->port2chan=NULL; - for (i=0; iproc[i]=0; - } + /* First process on this host */ + hd=xbt_new(gras_hostdata_t,1); + hd->ports = xbt_dynar_new(sizeof(gras_sg_portrec_t),NULL); - if (MSG_host_set_data(MSG_host_self(),(void*)hd) != MSG_OK) { + memset(hd->proc, 0, sizeof(hd->proc[0]) * XBT_MAX_CHANNEL); + + if (MSG_host_set_data(MSG_host_self(),(void*)hd) != MSG_OK) return unknown_error; - } } /* take a free channel for this process */ - for (i=0; iproc[i]; i++); - if (i == GRAS_MAX_CHANNEL) + trp_pd = (gras_trp_procdata_t)gras_libdata_get("gras_trp"); + for (i=0; iproc[i]; i++); + if (i == XBT_MAX_CHANNEL) RAISE2(system_error, "GRAS: Can't add a new process on %s, because all channel are already in use. Please increase MAX CHANNEL (which is %d for now) and recompile GRAS\n.", - MSG_host_get_name(MSG_host_self()),GRAS_MAX_CHANNEL); + MSG_host_get_name(MSG_host_self()),XBT_MAX_CHANNEL); - pd->chan = i; + trp_pd->chan = i; hd->proc[ i ] = MSG_process_self_PID(); + /* regiter it to the ports structure */ + pr.port = -1; + pr.tochan = i; + pr.raw = 0; + xbt_dynar_push(hd->ports,&pr); + /* take a free RAW channel for this process */ - for (i=0; iproc[i]; i++); - if (i == GRAS_MAX_CHANNEL) { + for (i=0; iproc[i]; i++); + if (i == XBT_MAX_CHANNEL) { RAISE2(system_error, "GRAS: Can't add a new process on %s, because all channel are already in use. Please increase MAX CHANNEL (which is %d for now) and recompile GRAS\n.", - MSG_host_get_name(MSG_host_self()),GRAS_MAX_CHANNEL); + MSG_host_get_name(MSG_host_self()),XBT_MAX_CHANNEL); } - pd->rawChan = i; + trp_pd->rawChan = i; + hd->proc[ i ] = MSG_process_self_PID(); + /* register it to the ports structure */ + prraw.port = -1; + prraw.tochan = i; + prraw.raw = 1; + xbt_dynar_push(hd->ports,&prraw); + VERB2("Creating process '%s' (%d)", MSG_process_get_name(MSG_process_self()), MSG_process_self_PID()); return no_error; } -gras_error_t +xbt_error_t gras_process_exit() { gras_hostdata_t *hd=(gras_hostdata_t *)MSG_host_get_data(MSG_host_self()); - gras_procdata_t *pd=(gras_procdata_t *)MSG_process_get_data(MSG_process_self()); + gras_msg_procdata_t msg_pd=(gras_msg_procdata_t)gras_libdata_get("gras_msg"); + gras_trp_procdata_t trp_pd=(gras_trp_procdata_t)gras_libdata_get("gras_trp"); int myPID=MSG_process_self_PID(); - int i; + int cpt; + gras_sg_portrec_t pr; - gras_assert0(hd && pd,"Run gras_process_init!!\n"); + xbt_assert0(hd,"Run gras_process_init (ie, gras_init)!!"); INFO2("GRAS: Finalizing process '%s' (%d)", MSG_process_get_name(MSG_process_self()),MSG_process_self_PID()); - if (gras_dynar_length(pd->msg_queue)) - WARN1("process %d terminated, but some queued messages where not handled",MSG_process_self_PID()); + if (xbt_dynar_length(msg_pd->msg_queue)) + WARN1("process %d terminated, but some messages are still queued", + MSG_process_self_PID()); - for (i=0; i< GRAS_MAX_CHANNEL; i++) - if (myPID == hd->proc[i]) - hd->proc[i] = 0; + for (cpt=0; cpt< XBT_MAX_CHANNEL; cpt++) + if (myPID == hd->proc[cpt]) + hd->proc[cpt] = 0; - for (i=0; iportLen; i++) { - if (hd->port2chan[ i ] == pd->chan) { - memmove(&(hd->port[i]), &(hd->port[i+1]), (hd->portLen -i -1) * sizeof(int)); - memmove(&(hd->port2chan[i]), &(hd->port2chan[i+1]), (hd->portLen -i -1) * sizeof(int)); - hd->portLen--; - i--; /* counter the effect of the i++ at the end of the iteration */ + xbt_dynar_foreach(hd->ports, cpt, pr) { + if (pr.port == trp_pd->chan || pr.port == trp_pd->rawChan) { + xbt_dynar_cursor_rm(hd->ports, &cpt); } } @@ -105,10 +116,21 @@ gras_process_exit() { * **************************************************************************/ gras_procdata_t *gras_procdata_get(void) { - gras_procdata_t *pd=(gras_procdata_t *)MSG_process_get_data(MSG_process_self()); + gras_procdata_t *pd= + (gras_procdata_t *)MSG_process_get_data(MSG_process_self()); - gras_assert0(pd,"Run gras_process_init!"); + xbt_assert0(pd,"Run gras_process_init! (ie, gras_init)"); return pd; } +const char* xbt_procname(void) { + const char *res = NULL; + m_process_t process = MSG_process_self(); + if ((process != NULL) && (process->simdata)) + res = MSG_process_get_name(process); + if (res) + return res; + else + return ""; +}