rpl/src/gestion_objets.c - diff

Return to gestion_objets.c CVS log

Up to [local] / rpl / src

Diff for /rpl/src/gestion_objets.c between versions 1.102 and 1.112

CVSweb interface <joel.bertrand@systella.fr>

version 1.102, 2013/05/22 13:40:40	version 1.112, 2015/01/05 13:12:32
Line 1	Line 1
/*	/*
================================================================================	================================================================================
RPL/2 (R) version 4.1.14	RPL/2 (R) version 4.1.19
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 2837 copie_etat_processus(struct_processus *s	Line 2837 copie_etat_processus(struct_processus *s

integer8 i;	integer8 i;

if (pthread_mutex_lock(&((*s_etat_processus).mutex)) != 0)	if (pthread_mutex_lock(&((*s_etat_processus).mutex_pile_processus)) != 0)
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
return(NULL);	return(NULL);
Line 2947 copie_etat_processus(struct_processus *s	Line 2947 copie_etat_processus(struct_processus *s
if (((*s_nouvel_etat_processus).indep = copie_objet(s_etat_processus,	if (((*s_nouvel_etat_processus).indep = copie_objet(s_etat_processus,
(*s_etat_processus).indep, 'P')) == NULL)	(*s_etat_processus).indep, 'P')) == NULL)
{	{
if (pthread_mutex_unlock(&((*s_etat_processus).mutex)) != 0)	if (pthread_mutex_unlock(&((*s_etat_processus)
	.mutex_pile_processus)) != 0)
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
return(NULL);	return(NULL);
Line 2967 copie_etat_processus(struct_processus *s	Line 2968 copie_etat_processus(struct_processus *s
if (((*s_nouvel_etat_processus).depend = copie_objet(s_etat_processus,	if (((*s_nouvel_etat_processus).depend = copie_objet(s_etat_processus,
(*s_etat_processus).depend, 'P')) == NULL)	(*s_etat_processus).depend, 'P')) == NULL)
{	{
if (pthread_mutex_unlock(&((*s_etat_processus).mutex)) != 0)	if (pthread_mutex_unlock(&((*s_etat_processus)
	.mutex_pile_processus)) != 0)
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
return(NULL);	return(NULL);
Line 2988 copie_etat_processus(struct_processus *s	Line 2990 copie_etat_processus(struct_processus *s
copie_objet(s_etat_processus, (*s_etat_processus)	copie_objet(s_etat_processus, (*s_etat_processus)
.parametres_courbes_de_niveau, 'P')) == NULL)	.parametres_courbes_de_niveau, 'P')) == NULL)
{	{
if (pthread_mutex_unlock(&((*s_etat_processus).mutex)) != 0)	if (pthread_mutex_unlock(&((*s_etat_processus)
	.mutex_pile_processus)) != 0)
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
return(NULL);	return(NULL);
Line 3012 copie_etat_processus(struct_processus *s	Line 3015 copie_etat_processus(struct_processus *s
(s_etat_processus).instruction_courante) + 1)	(s_etat_processus).instruction_courante) + 1)
sizeof(unsigned char))) == NULL)	sizeof(unsigned char))) == NULL)
{	{
if (pthread_mutex_unlock(&((*s_etat_processus).mutex)) != 0)	if (pthread_mutex_unlock(&((*s_etat_processus)
	.mutex_pile_processus)) != 0)
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
return(NULL);	return(NULL);
Line 3036 copie_etat_processus(struct_processus *s	Line 3040 copie_etat_processus(struct_processus *s
(s_etat_processus).label_x) + 1)	(s_etat_processus).label_x) + 1)
sizeof(unsigned char))) == NULL)	sizeof(unsigned char))) == NULL)
{	{
if (pthread_mutex_unlock(&((*s_etat_processus).mutex)) != 0)	if (pthread_mutex_unlock(&((*s_etat_processus)
	.mutex_pile_processus)) != 0)
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
return(NULL);	return(NULL);
Line 3060 copie_etat_processus(struct_processus *s	Line 3065 copie_etat_processus(struct_processus *s
(s_etat_processus).label_y) + 1)	(s_etat_processus).label_y) + 1)
sizeof(unsigned char))) == NULL)	sizeof(unsigned char))) == NULL)
{	{
if (pthread_mutex_unlock(&((*s_etat_processus).mutex)) != 0)	if (pthread_mutex_unlock(&((*s_etat_processus)
	.mutex_pile_processus)) != 0)
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
return(NULL);	return(NULL);
Line 3084 copie_etat_processus(struct_processus *s	Line 3090 copie_etat_processus(struct_processus *s
(s_etat_processus).label_z) + 1)	(s_etat_processus).label_z) + 1)
sizeof(unsigned char))) == NULL)	sizeof(unsigned char))) == NULL)
{	{
if (pthread_mutex_unlock(&((*s_etat_processus).mutex)) != 0)	if (pthread_mutex_unlock(&((*s_etat_processus)
	.mutex_pile_processus)) != 0)
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
return(NULL);	return(NULL);
Line 3108 copie_etat_processus(struct_processus *s	Line 3115 copie_etat_processus(struct_processus *s
(s_etat_processus).titre) + 1)	(s_etat_processus).titre) + 1)
sizeof(unsigned char))) == NULL)	sizeof(unsigned char))) == NULL)
{	{
if (pthread_mutex_unlock(&((*s_etat_processus).mutex)) != 0)	if (pthread_mutex_unlock(&((*s_etat_processus)
	.mutex_pile_processus)) != 0)
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
return(NULL);	return(NULL);
Line 3132 copie_etat_processus(struct_processus *s	Line 3140 copie_etat_processus(struct_processus *s
(s_etat_processus).legende) + 1)	(s_etat_processus).legende) + 1)
sizeof(unsigned char))) == NULL)	sizeof(unsigned char))) == NULL)
{	{
if (pthread_mutex_unlock(&((*s_etat_processus).mutex)) != 0)	if (pthread_mutex_unlock(&((*s_etat_processus)
	.mutex_pile_processus)) != 0)
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
return(NULL);	return(NULL);
Line 3179 copie_etat_processus(struct_processus *s	Line 3188 copie_etat_processus(struct_processus *s
{	{
if ((l_element_suivant = malloc(sizeof(struct_liste_chainee))) == NULL)	if ((l_element_suivant = malloc(sizeof(struct_liste_chainee))) == NULL)
{	{
if (pthread_mutex_unlock(&((*s_etat_processus).mutex)) != 0)	if (pthread_mutex_unlock(&((*s_etat_processus)
	.mutex_pile_processus)) != 0)
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
return(NULL);	return(NULL);
Line 3192 copie_etat_processus(struct_processus *s	Line 3202 copie_etat_processus(struct_processus *s
if (((*l_element_suivant).donnee = copie_objet(s_etat_processus,	if (((*l_element_suivant).donnee = copie_objet(s_etat_processus,
(*l_element_lecture).donnee, 'P')) == NULL)	(*l_element_lecture).donnee, 'P')) == NULL)
{	{
if (pthread_mutex_unlock(&((*s_etat_processus).mutex)) != 0)	if (pthread_mutex_unlock(&((*s_etat_processus)
	.mutex_pile_processus)) != 0)
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
return(NULL);	return(NULL);
Line 3228 copie_etat_processus(struct_processus *s	Line 3239 copie_etat_processus(struct_processus *s

if ((*s_nouvel_etat_processus).erreur_systeme != d_es)	if ((*s_nouvel_etat_processus).erreur_systeme != d_es)
{	{
if (pthread_mutex_unlock(&((*s_etat_processus).mutex)) != 0)	if (pthread_mutex_unlock(&((*s_etat_processus).mutex_pile_processus))
	!= 0)
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
return(NULL);	return(NULL);
Line 3250 copie_etat_processus(struct_processus *s	Line 3262 copie_etat_processus(struct_processus *s

if ((*s_nouvel_etat_processus).erreur_systeme != d_es)	if ((*s_nouvel_etat_processus).erreur_systeme != d_es)
{	{
if (pthread_mutex_unlock(&((*s_etat_processus).mutex)) != 0)	if (pthread_mutex_unlock(&((*s_etat_processus).mutex_pile_processus))
	!= 0)
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
return(NULL);	return(NULL);
Line 3284 copie_etat_processus(struct_processus *s	Line 3297 copie_etat_processus(struct_processus *s
{	{
if ((l_element_suivant = malloc(sizeof(struct_liste_chainee))) == NULL)	if ((l_element_suivant = malloc(sizeof(struct_liste_chainee))) == NULL)
{	{
if (pthread_mutex_unlock(&((*s_etat_processus).mutex)) != 0)	if (pthread_mutex_unlock(&((*s_etat_processus)
	.mutex_pile_processus)) != 0)
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
return(NULL);	return(NULL);
Line 3297 copie_etat_processus(struct_processus *s	Line 3311 copie_etat_processus(struct_processus *s
if (((*l_element_suivant).donnee = copie_objet(s_etat_processus,	if (((*l_element_suivant).donnee = copie_objet(s_etat_processus,
(*l_element_lecture).donnee, 'P')) == NULL)	(*l_element_lecture).donnee, 'P')) == NULL)
{	{
if (pthread_mutex_unlock(&((*s_etat_processus).mutex)) != 0)	if (pthread_mutex_unlock(&((*s_etat_processus)
	.mutex_pile_processus)) != 0)
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
return(NULL);	return(NULL);
Line 3330 copie_etat_processus(struct_processus *s	Line 3345 copie_etat_processus(struct_processus *s
{	{
if ((l_element_suivant = malloc(sizeof(struct_liste_chainee))) == NULL)	if ((l_element_suivant = malloc(sizeof(struct_liste_chainee))) == NULL)
{	{
if (pthread_mutex_unlock(&((*s_etat_processus).mutex)) != 0)	if (pthread_mutex_unlock(&((*s_etat_processus)
	.mutex_pile_processus)) != 0)
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
return(NULL);	return(NULL);
Line 3343 copie_etat_processus(struct_processus *s	Line 3359 copie_etat_processus(struct_processus *s
if (((*l_element_suivant).donnee = copie_objet(s_etat_processus,	if (((*l_element_suivant).donnee = copie_objet(s_etat_processus,
(*l_element_lecture).donnee, 'P')) == NULL)	(*l_element_lecture).donnee, 'P')) == NULL)
{	{
if (pthread_mutex_unlock(&((*s_etat_processus).mutex)) != 0)	if (pthread_mutex_unlock(&((*s_etat_processus)
	.mutex_pile_processus)) != 0)
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
return(NULL);	return(NULL);
Line 3381 copie_etat_processus(struct_processus *s	Line 3398 copie_etat_processus(struct_processus *s
{	{
if ((l_element_suivant = malloc(sizeof(struct_liste_chainee))) == NULL)	if ((l_element_suivant = malloc(sizeof(struct_liste_chainee))) == NULL)
{	{
if (pthread_mutex_unlock(&((*s_etat_processus).mutex)) != 0)	if (pthread_mutex_unlock(&((*s_etat_processus)
	.mutex_pile_processus)) != 0)
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
return(NULL);	return(NULL);
Line 3394 copie_etat_processus(struct_processus *s	Line 3412 copie_etat_processus(struct_processus *s
if (((*l_element_suivant).donnee = copie_objet(s_etat_processus,	if (((*l_element_suivant).donnee = copie_objet(s_etat_processus,
(*l_element_lecture).donnee, 'P')) == NULL)	(*l_element_lecture).donnee, 'P')) == NULL)
{	{
if (pthread_mutex_unlock(&((*s_etat_processus).mutex)) != 0)	if (pthread_mutex_unlock(&((*s_etat_processus)
	.mutex_pile_processus)) != 0)
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
return(NULL);	return(NULL);
Line 3427 copie_etat_processus(struct_processus *s	Line 3446 copie_etat_processus(struct_processus *s
{	{
if ((l_element_suivant = malloc(sizeof(struct_liste_chainee))) == NULL)	if ((l_element_suivant = malloc(sizeof(struct_liste_chainee))) == NULL)
{	{
if (pthread_mutex_unlock(&((*s_etat_processus).mutex)) != 0)	if (pthread_mutex_unlock(&((*s_etat_processus)
	.mutex_pile_processus)) != 0)
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
return(NULL);	return(NULL);
Line 3456 copie_etat_processus(struct_processus *s	Line 3476 copie_etat_processus(struct_processus *s
malloc((strlen((((struct_bibliotheque ) (*l_element_lecture)	malloc((strlen((((struct_bibliotheque ) (*l_element_lecture)
.donnee)).nom) + 1) * sizeof(unsigned char))) == NULL)	.donnee)).nom) + 1) * sizeof(unsigned char))) == NULL)
{	{
if (pthread_mutex_unlock(&((*s_etat_processus).mutex)) != 0)	if (pthread_mutex_unlock(&((*s_etat_processus)
	.mutex_pile_processus)) != 0)
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
return(NULL);	return(NULL);
Line 3533 copie_etat_processus(struct_processus *s	Line 3554 copie_etat_processus(struct_processus *s

pthread_mutexattr_init(&attributs_mutex);	pthread_mutexattr_init(&attributs_mutex);
pthread_mutexattr_settype(&attributs_mutex, PTHREAD_MUTEX_NORMAL);	pthread_mutexattr_settype(&attributs_mutex, PTHREAD_MUTEX_NORMAL);
pthread_mutex_init(&((*s_nouvel_etat_processus).mutex), &attributs_mutex);	pthread_mutex_init(&((*s_nouvel_etat_processus).mutex_pile_processus),
	&attributs_mutex);
	pthread_mutexattr_destroy(&attributs_mutex);

	pthread_mutexattr_init(&attributs_mutex);
	pthread_mutexattr_settype(&attributs_mutex, PTHREAD_MUTEX_NORMAL);
	pthread_mutex_init(&((*s_nouvel_etat_processus).mutex_interruptions),
	&attributs_mutex);
	pthread_mutexattr_destroy(&attributs_mutex);

	pthread_mutexattr_init(&attributs_mutex);
	pthread_mutexattr_settype(&attributs_mutex, PTHREAD_MUTEX_NORMAL);
	pthread_mutex_init(&((*s_nouvel_etat_processus).mutex_signaux),
	&attributs_mutex);
pthread_mutexattr_destroy(&attributs_mutex);	pthread_mutexattr_destroy(&attributs_mutex);

pthread_mutexattr_init(&attributs_mutex);	pthread_mutexattr_init(&attributs_mutex);
Line 3542 copie_etat_processus(struct_processus *s	Line 3576 copie_etat_processus(struct_processus *s
&attributs_mutex);	&attributs_mutex);
pthread_mutexattr_destroy(&attributs_mutex);	pthread_mutexattr_destroy(&attributs_mutex);

if (pthread_mutex_unlock(&((*s_etat_processus).mutex)) != 0)	if (pthread_mutex_unlock(&((*s_etat_processus).mutex_pile_processus)) != 0)
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
return(NULL);	return(NULL);

Removed from v.1.102
changed lines
	Added in v.1.112