rpl/src/rpl.c - diff

Return to rpl.c CVS log

Up to [local] / rpl / src

Diff for /rpl/src/rpl.c between versions 1.79 and 1.80

version 1.79, 2011/09/01 12:14:56	version 1.80, 2011/09/03 10:31:50
Line 187 rplinit(int argc, char *argv[], unsigned	Line 187 rplinit(int argc, char *argv[], unsigned
(*s_etat_processus).exception = d_ep;	(*s_etat_processus).exception = d_ep;
(*s_etat_processus).erreur_systeme = d_es;	(*s_etat_processus).erreur_systeme = d_es;
(*s_etat_processus).erreur_execution = d_ex;	(*s_etat_processus).erreur_execution = d_ex;
	(*s_etat_processus).compteur_violation_d_acces = 0;

(*s_etat_processus).rpl_home = rpl_home;	(*s_etat_processus).rpl_home = rpl_home;

Line 2765 rplinit(int argc, char *argv[], unsigned	Line 2766 rplinit(int argc, char *argv[], unsigned
if (setjmp(contexte_initial) == 0)	if (setjmp(contexte_initial) == 0)
{	{
erreur = sequenceur(s_etat_processus);	erreur = sequenceur(s_etat_processus);

	if (erreur == d_absence_erreur)
	{
	if (((*s_etat_processus).var_volatile_alarme
	== 0) && ((*s_etat_processus)
	.arret_depuis_abort == 0) &&
	((*s_etat_processus).at_exit
	!= NULL))
	{
	erreur = evaluation(s_etat_processus,
	(*s_etat_processus).at_exit,
	'E');
	}
	}
}	}
}	}
else	else
Line 2772 rplinit(int argc, char *argv[], unsigned	Line 2787 rplinit(int argc, char *argv[], unsigned
if (setjmp(contexte_initial) == 0)	if (setjmp(contexte_initial) == 0)
{	{
erreur = sequenceur_optimise(s_etat_processus);	erreur = sequenceur_optimise(s_etat_processus);
}
}

if (erreur == d_absence_erreur)	if (erreur == d_absence_erreur)
{	{
if (((*s_etat_processus).var_volatile_alarme == 0)	if (((*s_etat_processus).var_volatile_alarme
&& ((*s_etat_processus).arret_depuis_abort	== 0) && ((*s_etat_processus)
== 0) && ((*s_etat_processus).at_exit	.arret_depuis_abort == 0) &&
!= NULL))	((*s_etat_processus).at_exit
{	!= NULL))
erreur = evaluation(s_etat_processus,	{
(*s_etat_processus).at_exit, 'E');	erreur = evaluation(s_etat_processus,
	(*s_etat_processus).at_exit,
	'E');
	}
	}
}	}
}	}
}	}

CVSweb interface <joel.bertrand@systella.fr>

Removed from v.1.79
changed lines
	Added in v.1.80