rpl/src/instructions_s1.c - diff

Return to instructions_s1.c CVS log

Up to [local] / rpl / src

Diff for /rpl/src/instructions_s1.c between versions 1.39 and 1.45

version 1.39, 2011/09/20 08:56:23	version 1.45, 2012/01/17 14:44:10
Line 1	Line 1
/*	/*
================================================================================	================================================================================
RPL/2 (R) version 4.1.3	RPL/2 (R) version 4.1.6
Copyright (C) 1989-2011 Dr. BERTRAND Joël	Copyright (C) 1989-2012 Dr. BERTRAND Joël

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

Line 3858 instruction_syseval(struct_processus *s_	Line 3858 instruction_syseval(struct_processus *s_
longueur_ecriture = strlen((unsigned char *)	longueur_ecriture = strlen((unsigned char *)
((l_element_courant).donnee).objet);	((l_element_courant).donnee).objet);

if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)	# ifndef SEMAPHORES_NOMMES
	if (sem_post(&((*s_etat_processus).semaphore_fork))
	!= 0)
	# else
	if (sem_post((*s_etat_processus).semaphore_fork) != 0)
	# endif
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
return;	return;
Line 3869 instruction_syseval(struct_processus *s_	Line 3874 instruction_syseval(struct_processus *s_
((l_element_courant).donnee).objet,	((l_element_courant).donnee).objet,
longueur_ecriture) != longueur_ecriture)	longueur_ecriture) != longueur_ecriture)
{	{
while(sem_wait(&((*s_etat_processus)	# ifndef SEMAPHORES_NOMMES
.semaphore_fork)) != 0)	while(sem_wait(&((*s_etat_processus)
	.semaphore_fork)) != 0)
	# else
	while(sem_wait((*s_etat_processus)
	.semaphore_fork) != 0)
	# endif
{	{
(*s_etat_processus).erreur_systeme =	(*s_etat_processus).erreur_systeme =
d_es_processus;	d_es_processus;
Line 3883 instruction_syseval(struct_processus *s_	Line 3893 instruction_syseval(struct_processus *s_
return;	return;
}	}

if (sem_post(&((*s_etat_processus)	# ifndef SEMAPHORES_NOMMES
.semaphore_fork)) != 0)	if (sem_post(&((*s_etat_processus)
	.semaphore_fork)) != 0)
	# else
	if (sem_post((*s_etat_processus)
	.semaphore_fork) != 0)
	# endif
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
return;	return;
Line 3894 instruction_syseval(struct_processus *s_	Line 3909 instruction_syseval(struct_processus *s_
while(write_atomic(s_etat_processus,	while(write_atomic(s_etat_processus,
pipes_entree[1], "\n", 1) != 1)	pipes_entree[1], "\n", 1) != 1)
{	{
if (sem_wait(&((*s_etat_processus)	# ifndef SEMAPHORES_NOMMES
.semaphore_fork)) != 0)	while(sem_wait(&((*s_etat_processus)
	.semaphore_fork)) != 0)
	# else
	while(sem_wait((*s_etat_processus)
	.semaphore_fork) != 0)
	# endif
{	{
(*s_etat_processus).erreur_systeme =	if (errno != EINTR)
d_es_processus;	{
return;	(*s_etat_processus).erreur_systeme =
	d_es_processus;
	return;
	}
}	}

if (longueur_ecriture == -1)	if (longueur_ecriture == -1)
Line 3908 instruction_syseval(struct_processus *s_	Line 3931 instruction_syseval(struct_processus *s_
return;	return;
}	}

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

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

l_element_courant = (*l_element_courant).suivant;	l_element_courant = (*l_element_courant).suivant;
Line 3943 instruction_syseval(struct_processus *s_	Line 3979 instruction_syseval(struct_processus *s_
* Récupération de la valeur de retour du processus détaché	* Récupération de la valeur de retour du processus détaché
*/	*/

if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)	# ifndef SEMAPHORES_NOMMES
	if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
	# else
	if (sem_post((*s_etat_processus).semaphore_fork) != 0)
	# endif
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
return;	return;
Line 3951 instruction_syseval(struct_processus *s_	Line 3991 instruction_syseval(struct_processus *s_

if (waitpid(pid, &status, 0) == -1)	if (waitpid(pid, &status, 0) == -1)
{	{
if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)	# ifndef SEMAPHORES_NOMMES
	if (sem_post(&((*s_etat_processus).semaphore_fork))
	!= 0)
	# else
	if (sem_post((*s_etat_processus).semaphore_fork) != 0)
	# endif
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
return;	return;
Line 3961 instruction_syseval(struct_processus *s_	Line 4006 instruction_syseval(struct_processus *s_
return;	return;
}	}

if (sem_wait(&((*s_etat_processus).semaphore_fork)) != 0)	# ifndef SEMAPHORES_NOMMES
	while(sem_wait(&((*s_etat_processus).semaphore_fork)) != 0)
	# else
	while(sem_wait((*s_etat_processus).semaphore_fork) != 0)
	# endif
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	if (errno != EINTR)
return;	{
	(*s_etat_processus).erreur_systeme = d_es_processus;
	return;
	}
}	}
} while((!WIFEXITED(status)) && (!WIFSIGNALED(status)));	} while((!WIFEXITED(status)) && (!WIFSIGNALED(status)));

Line 3979 instruction_syseval(struct_processus *s_	Line 4031 instruction_syseval(struct_processus *s_
return;	return;
}	}

if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)	# ifndef SEMAPHORES_NOMMES
	if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
	# else
	if (sem_post((*s_etat_processus).semaphore_fork) != 0)
	# endif
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
return;	return;
Line 3989 instruction_syseval(struct_processus *s_	Line 4045 instruction_syseval(struct_processus *s_
pipes_sortie[0], &(tampon[pointeur]),	pipes_sortie[0], &(tampon[pointeur]),
longueur_lecture)) > 0)	longueur_lecture)) > 0)
{	{
while(sem_wait(&((*s_etat_processus).semaphore_fork))	# ifndef SEMAPHORES_NOMMES
!= 0)	while(sem_wait(&((*s_etat_processus).semaphore_fork)) != 0)
	# else
	while(sem_wait((*s_etat_processus).semaphore_fork) != 0)
	# endif
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
return;	return;
Line 4009 instruction_syseval(struct_processus *s_	Line 4068 instruction_syseval(struct_processus *s_
return;	return;
}	}

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

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

if ((tampon = realloc(tampon, (strlen(tampon) + 1) *	if ((tampon = realloc(tampon, (strlen(tampon) + 1) *
Line 4162 instruction_syseval(struct_processus *s_	Line 4231 instruction_syseval(struct_processus *s_
return;	return;
}	}

if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)	# ifndef SEMAPHORES_NOMMES
	if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
	# else
	if (sem_post((*s_etat_processus).semaphore_fork) != 0)
	# endif
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
return;	return;
Line 4179 instruction_syseval(struct_processus *s_	Line 4252 instruction_syseval(struct_processus *s_
&((*s_etat_processus).l_base_pile), s_objet_resultat)	&((*s_etat_processus).l_base_pile), s_objet_resultat)
== d_erreur)	== d_erreur)
{	{
if (sem_wait(&((*s_etat_processus).semaphore_fork)) != 0)	# ifndef SEMAPHORES_NOMMES
	while(sem_wait(&((*s_etat_processus).semaphore_fork)) != 0)
	# else
	while(sem_wait((*s_etat_processus).semaphore_fork) != 0)
	# endif
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	if (errno != EINTR)
return;	{
	(*s_etat_processus).erreur_systeme = d_es_processus;
	return;
	}
}	}

if (close(pipes_erreur[0]) != 0)	if (close(pipes_erreur[0]) != 0)
Line 4195 instruction_syseval(struct_processus *s_	Line 4275 instruction_syseval(struct_processus *s_
return;	return;
}	}

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

if (close(pipes_erreur[0]) != 0)	if (close(pipes_erreur[0]) != 0)

CVSweb interface <joel.bertrand@systella.fr>

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