rpl/src/optimisation.c - diff

Return to optimisation.c CVS log

Up to [local] / rpl / src

Diff for /rpl/src/optimisation.c between versions 1.49 and 1.65

version 1.49, 2013/03/21 11:30:31	version 1.65, 2015/02/19 11:01:29
Line 1	Line 1
/*	/*
================================================================================	================================================================================
RPL/2 (R) version 4.1.13	RPL/2 (R) version 4.1.21
Copyright (C) 1989-2013 Dr. BERTRAND Joël	Copyright (C) 1989-2015 Dr. BERTRAND Joël

This file is part of RPL/2.	This file is part of RPL/2.

Line 40 sequenceur_optimise(struct_processus *s_	Line 40 sequenceur_optimise(struct_processus *s_
{	{
integer8 adresse_point_entree;	integer8 adresse_point_entree;
integer8 i;	integer8 i;
	integer8 j;
integer8 nb_variables;	integer8 nb_variables;
integer8 point_entree;	integer8 point_entree;

Line 97 sequenceur_optimise(struct_processus *s_	Line 98 sequenceur_optimise(struct_processus *s_
return(d_erreur);	return(d_erreur);
}	}

liste_variables(s_etat_processus, tableau);	nb_variables = liste_variables(s_etat_processus, tableau);

for(i = 0; i < nb_variables; i++)	for(i = 0; i < nb_variables; i++)
{	{
Line 136 sequenceur_optimise(struct_processus *s_	Line 137 sequenceur_optimise(struct_processus *s_
printf("+++Fatal : Compilation failed\n");	printf("+++Fatal : Compilation failed\n");
}	}

	for(j = 0; j < nb_variables; j++)
	{
	if (tableau[j].mutex != NULL)
	{
	pthread_mutex_unlock(tableau[j].mutex);
	}
	}

free(tableau);	free(tableau);
return(d_erreur);	return(d_erreur);
}	}
Line 147 sequenceur_optimise(struct_processus *s_	Line 156 sequenceur_optimise(struct_processus *s_

registre = (*s_etat_processus).autorisation_nom_implicite;	registre = (*s_etat_processus).autorisation_nom_implicite;
(*s_etat_processus).autorisation_nom_implicite = 'Y';	(*s_etat_processus).autorisation_nom_implicite = 'Y';
	(*s_etat_processus).type_en_cours = NON;
recherche_type(s_etat_processus);	recherche_type(s_etat_processus);
(*s_etat_processus).autorisation_nom_implicite = registre;	(*s_etat_processus).autorisation_nom_implicite = registre;

Line 194 sequenceur_optimise(struct_processus *s_	Line 204 sequenceur_optimise(struct_processus *s_
printf("+++Fatal : Compilation failed\n");	printf("+++Fatal : Compilation failed\n");
}	}

	for(j = 0; j < nb_variables; j++)
	{
	if (tableau[j].mutex != NULL)
	{
	pthread_mutex_unlock(tableau[j].mutex);
	}
	}

free(tableau);	free(tableau);
return(d_erreur);	return(d_erreur);
}	}
Line 213 sequenceur_optimise(struct_processus *s_	Line 231 sequenceur_optimise(struct_processus *s_
printf("+++Fatal : Compilation failed\n");	printf("+++Fatal : Compilation failed\n");
}	}

	for(j = 0; j < nb_variables; j++)
	{
	if (tableau[j].mutex != NULL)
	{
	pthread_mutex_unlock(tableau[j].mutex);
	}
	}

free(tableau);	free(tableau);
return(d_erreur);	return(d_erreur);
}	}
Line 232 sequenceur_optimise(struct_processus *s_	Line 258 sequenceur_optimise(struct_processus *s_
printf("+++Fatal : Compilation failed\n");	printf("+++Fatal : Compilation failed\n");
}	}

	for(j = 0; j < nb_variables; j++)
	{
	if (tableau[j].mutex != NULL)
	{
	pthread_mutex_unlock(tableau[j].mutex);
	}
	}

free(tableau);	free(tableau);
return(d_erreur);	return(d_erreur);
}	}
Line 258 sequenceur_optimise(struct_processus *s_	Line 292 sequenceur_optimise(struct_processus *s_
printf("+++Fatal : Compilation failed\n");	printf("+++Fatal : Compilation failed\n");
}	}

	for(j = 0; j < nb_variables; j++)
	{
	if (tableau[j].mutex != NULL)
	{
	pthread_mutex_unlock(tableau[j].mutex);
	}
	}

free(tableau);	free(tableau);
return(d_erreur);	return(d_erreur);
}	}
Line 299 sequenceur_optimise(struct_processus *s_	Line 341 sequenceur_optimise(struct_processus *s_
printf("+++Fatal : Compilation failed\n");	printf("+++Fatal : Compilation failed\n");
}	}

	for(j = 0; j < nb_variables; j++)
	{
	if (tableau[j].mutex != NULL)
	{
	pthread_mutex_unlock(tableau[j].mutex);
	}
	}

free(tableau);	free(tableau);
return(d_erreur);	return(d_erreur);
}	}
Line 323 sequenceur_optimise(struct_processus *s_	Line 373 sequenceur_optimise(struct_processus *s_
printf("+++System : Not enough memory\n");	printf("+++System : Not enough memory\n");
}	}

	for(j = 0; j < nb_variables; j++)
	{
	if (tableau[j].mutex != NULL)
	{
	pthread_mutex_unlock(tableau[j].mutex);
	}
	}

free(tableau);	free(tableau);
return(d_erreur);	return(d_erreur);
}	}

	for(j = 0; j < nb_variables; j++)
	{
	if (tableau[j].mutex != NULL)
	{
	pthread_mutex_unlock(tableau[j].mutex);
	}
	}

free(tableau);	free(tableau);

erreur = evaluation(s_etat_processus, programme_principal, 'E');	erreur = evaluation(s_etat_processus, programme_principal, 'E');

CVSweb interface <joel.bertrand@systella.fr>

Removed from v.1.49
changed lines
	Added in v.1.65