rpl/src/instructions_r4.c - diff

Return to instructions_r4.c CVS log

Up to [local] / rpl / src

Diff for /rpl/src/instructions_r4.c between versions 1.39 and 1.41

version 1.39, 2011/07/25 07:44:58	version 1.41, 2011/09/14 17:55:59
Line 1	Line 1
/*	/*
================================================================================	================================================================================
RPL/2 (R) version 4.1.2	RPL/2 (R) version 4.1.3
Copyright (C) 1989-2011 Dr. BERTRAND Joël	Copyright (C) 1989-2011 Dr. BERTRAND Joël

This file is part of RPL/2.	This file is part of RPL/2.
Line 2048 instruction_read(struct_processus *s_eta	Line 2048 instruction_read(struct_processus *s_eta
return;	return;
}	}

# ifndef SEMAPHORES_NOMMES	if (pthread_mutex_unlock(&((*s_etat_processus).mutex_fork))
if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)	!= 0)
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
return;	return;
}	}
# else
if (sem_post((*s_etat_processus).semaphore_fork) != 0)
{
(*s_etat_processus).erreur_systeme = d_es_processus;
return;
}
# endif

attente.tv_sec = 0;	attente.tv_sec = 0;
attente.tv_nsec = GRANULARITE_us * 1000;	attente.tv_nsec = GRANULARITE_us * 1000;
Line 2116 instruction_read(struct_processus *s_eta	Line 2109 instruction_read(struct_processus *s_eta
free(tampon_lecture);	free(tampon_lecture);
liberation(s_etat_processus, s_objet_argument_1);	liberation(s_etat_processus, s_objet_argument_1);

# ifndef SEMAPHORES_NOMMES	while(pthread_mutex_lock(&((*s_etat_processus)
while(sem_wait(&((*s_etat_processus)	.mutex_fork)) != 0)
.semaphore_fork)) == -1)
# else
while(sem_wait((*s_etat_processus)
.semaphore_fork) == -1)
# endif
{	{
if (errno != EINTR)	(*s_etat_processus).erreur_systeme =
{	d_es_processus;
(*s_etat_processus).erreur_systeme =
d_es_processus;
return;
}
}	}

(*s_etat_processus).erreur_execution =	(*s_etat_processus).erreur_execution =
Line 2153 instruction_read(struct_processus *s_eta	Line 2137 instruction_read(struct_processus *s_eta
}	}
}	}

# ifndef SEMAPHORES_NOMMES	if (pthread_mutex_lock(&((*s_etat_processus).mutex_fork)) != 0)
while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)
# else
while(sem_wait((*s_etat_processus).semaphore_fork) == -1)
# endif
{	{
if (errno != EINTR)	(*s_etat_processus).erreur_systeme = d_es_processus;
{	return;
(*s_etat_processus).erreur_systeme = d_es_processus;
return;
}
}	}

if ((*s_etat_processus).var_volatile_requete_arret == -1)	if ((*s_etat_processus).var_volatile_requete_arret == -1)
Line 2559 instruction_read(struct_processus *s_eta	Line 2536 instruction_read(struct_processus *s_eta
return;	return;
}	}

# ifndef SEMAPHORES_NOMMES	if (pthread_mutex_unlock(&((*s_etat_processus).mutex_fork))
if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)	!= 0)
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
return;	return;
}	}
# else
if (sem_post((*s_etat_processus).semaphore_fork) != 0)
{
(*s_etat_processus).erreur_systeme = d_es_processus;
return;
}
# endif

attente.tv_sec = 0;	attente.tv_sec = 0;
attente.tv_nsec = GRANULARITE_us * 1000;	attente.tv_nsec = GRANULARITE_us * 1000;
Line 2626 instruction_read(struct_processus *s_eta	Line 2596 instruction_read(struct_processus *s_eta
free(tampon_lecture);	free(tampon_lecture);
liberation(s_etat_processus, s_objet_argument_1);	liberation(s_etat_processus, s_objet_argument_1);

# ifndef SEMAPHORES_NOMMES	if (pthread_mutex_lock(&((*s_etat_processus)
while(sem_wait(&((*s_etat_processus)	.mutex_fork)) != 0)
.semaphore_fork)) == -1)
# else
while(sem_wait((*s_etat_processus)
.semaphore_fork) == -1)
# endif
{	{
if (errno != EINTR)	(*s_etat_processus).erreur_systeme =
{	d_es_processus;
(*s_etat_processus).erreur_systeme =	return;
d_es_processus;
return;
}
}	}

(*s_etat_processus).erreur_execution =	(*s_etat_processus).erreur_execution =
Line 2661 instruction_read(struct_processus *s_eta	Line 2623 instruction_read(struct_processus *s_eta
}	}
}	}

# ifndef SEMAPHORES_NOMMES	if (pthread_mutex_lock(&((*s_etat_processus).mutex_fork))
while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)	!= 0)
# else
while(sem_wait((*s_etat_processus).semaphore_fork) == -1)
# endif
{	{
if (errno != EINTR)	(*s_etat_processus).erreur_systeme = d_es_processus;
{	return;
(*s_etat_processus).erreur_systeme = d_es_processus;
return;
}
}	}

if ((*s_etat_processus).var_volatile_requete_arret == -1)	if ((*s_etat_processus).var_volatile_requete_arret == -1)

CVSweb interface <joel.bertrand@systella.fr>

Removed from v.1.39
changed lines
	Added in v.1.41