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.50

version 1.49, 2013/03/21 11:30:31	version 1.50, 2013/03/23 16:14:39
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 78 sequenceur_optimise(struct_processus *s_	Line 79 sequenceur_optimise(struct_processus *s_
(*s_etat_processus).autorisation_empilement_programme = 'Y';	(*s_etat_processus).autorisation_empilement_programme = 'Y';
(*s_etat_processus).mode_execution_programme = 'N';	(*s_etat_processus).mode_execution_programme = 'N';

	if (pthread_mutex_lock(&mutex_liste_variables_partagees) != 0)
	{
	(*s_etat_processus).erreur_systeme = d_es_processus;
	return(d_erreur);
	}

nb_variables = nombre_variables(s_etat_processus);	nb_variables = nombre_variables(s_etat_processus);

if ((tableau = malloc(((size_t) nb_variables) *	if ((tableau = malloc(((size_t) nb_variables) *
Line 94 sequenceur_optimise(struct_processus *s_	Line 101 sequenceur_optimise(struct_processus *s_

liberation_mutexes_arbre_variables_partagees(s_etat_processus,	liberation_mutexes_arbre_variables_partagees(s_etat_processus,
((s_etat_processus).s_arbre_variables_partagees));	((s_etat_processus).s_arbre_variables_partagees));
	pthread_mutex_unlock(&mutex_liste_variables_partagees);
return(d_erreur);	return(d_erreur);
}	}

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

	if (pthread_mutex_unlock(&mutex_liste_variables_partagees) != 0)
	{
	(*s_etat_processus).erreur_systeme = d_es_processus;
	return(d_erreur);
	}

for(i = 0; i < nb_variables; i++)	for(i = 0; i < nb_variables; i++)
{	{
Line 136 sequenceur_optimise(struct_processus *s_	Line 150 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 194 sequenceur_optimise(struct_processus *s_	Line 216 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 243 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 270 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 304 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 353 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 385 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.50