summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
3c1dbc2)
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@4680
48e7efb5-ca39-0410-a469-
dd3cf9ba447f
smx_host_t receiver, const char *name,
double size, double rate)
{
smx_host_t receiver, const char *name,
double size, double rate)
{
+ smx_action_t act;
+ smx_simdata_action_t simdata;
+
/* check if the host is active */
if (surf_workstation_model->extension_public->
get_state(sender->simdata->host) != SURF_CPU_ON) {
/* check if the host is active */
if (surf_workstation_model->extension_public->
get_state(sender->simdata->host) != SURF_CPU_ON) {
- smx_action_t act = xbt_new0(s_smx_action_t, 1);
+ act = xbt_new0(s_smx_action_t, 1);
act->simdata = xbt_new0(s_smx_simdata_action_t, 1);
act->simdata = xbt_new0(s_smx_simdata_action_t, 1);
- smx_simdata_action_t simdata = act->simdata;
+ simdata = act->simdata;
act->cond_list = xbt_fifo_new();
/* initialize them */
act->cond_list = xbt_fifo_new();
/* initialize them */
smx_action_t SIMIX_action_execute(smx_host_t host, char *name,
double amount)
{
smx_action_t SIMIX_action_execute(smx_host_t host, char *name,
double amount)
{
+ smx_action_t act;
+ smx_simdata_action_t simdata;
+
/* check if the host is active */
if (surf_workstation_model->extension_public->
get_state(host->simdata->host) != SURF_CPU_ON) {
/* check if the host is active */
if (surf_workstation_model->extension_public->
get_state(host->simdata->host) != SURF_CPU_ON) {
- smx_action_t act = xbt_new0(s_smx_action_t, 1);
+ act = xbt_new0(s_smx_action_t, 1);
act->simdata = xbt_new0(s_smx_simdata_action_t, 1);
act->simdata = xbt_new0(s_smx_simdata_action_t, 1);
- smx_simdata_action_t simdata = act->simdata;
+ simdata = act->simdata;
act->cond_list = xbt_fifo_new();
/* initialize them */
act->cond_list = xbt_fifo_new();
/* initialize them */
smx_action_t SIMIX_action_sleep(smx_host_t host, double duration)
{
char name[] = "sleep";
smx_action_t SIMIX_action_sleep(smx_host_t host, double duration)
{
char name[] = "sleep";
+ smx_simdata_action_t simdata;
+ smx_action_t act;
/* check if the host is active */
if (surf_workstation_model->extension_public->
/* check if the host is active */
if (surf_workstation_model->extension_public->
- smx_action_t act = xbt_new0(s_smx_action_t, 1);
+ act = xbt_new0(s_smx_action_t, 1);
act->simdata = xbt_new0(s_smx_simdata_action_t, 1);
act->simdata = xbt_new0(s_smx_simdata_action_t, 1);
- smx_simdata_action_t simdata = act->simdata;
+ simdata = act->simdata;
act->cond_list = xbt_fifo_new();
/* initialize them */
act->cond_list = xbt_fifo_new();
/* initialize them */
double amount, double rate)
{
void **workstation_list = NULL;
double amount, double rate)
{
void **workstation_list = NULL;
+ smx_simdata_action_t simdata;
+ smx_action_t act;
int i;
/* alloc structures */
int i;
/* alloc structures */
- smx_action_t act = xbt_new0(s_smx_action_t, 1);
+ act = xbt_new0(s_smx_action_t, 1);
act->simdata = xbt_new0(s_smx_simdata_action_t, 1);
act->simdata = xbt_new0(s_smx_simdata_action_t, 1);
- smx_simdata_action_t simdata = act->simdata;
+ simdata = act->simdata;
act->cond_list = xbt_fifo_new();
/* initialize them */
act->cond_list = xbt_fifo_new();
/* initialize them */