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.33 and 1.38

version 1.33, 2011/06/27 09:04:59	version 1.38, 2011/09/15 17:51:43
Line 1	Line 1
/*	/*
================================================================================	================================================================================
RPL/2 (R) version 4.1.0	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 3403 instruction_syseval(struct_processus *s_	Line 3403 instruction_syseval(struct_processus *s_

pid_t pid;	pid_t pid;

sigset_t oldset;
sigset_t set;

ssize_t longueur_ecriture;	ssize_t longueur_ecriture;

struct_liste_chainee *l_element_courant;	struct_liste_chainee *l_element_courant;
Line 3702 instruction_syseval(struct_processus *s_	Line 3699 instruction_syseval(struct_processus *s_

fflush(NULL);	fflush(NULL);

sigfillset(&set);
pthread_sigmask(SIG_BLOCK, &set, &oldset);

verrouillage_threads_concurrents(s_etat_processus);	verrouillage_threads_concurrents(s_etat_processus);
pid = fork();	pid = fork();
deverrouillage_threads_concurrents(s_etat_processus);	deverrouillage_threads_concurrents(s_etat_processus);

pthread_sigmask(SIG_SETMASK, &oldset, NULL);
sigpending(&set);

if (pid < 0)	if (pid < 0)
{	{
if (close(pipes_entree[0]) != 0)	if (close(pipes_entree[0]) != 0)
Line 3867 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);

# ifndef SEMAPHORES_NOMMES	if (pthread_mutex_unlock(&((*s_etat_processus).mutex_fork))
if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)	!= 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 3882 instruction_syseval(struct_processus *s_	Line 3870 instruction_syseval(struct_processus *s_
((l_element_courant).donnee).objet,	((l_element_courant).donnee).objet,
longueur_ecriture) != longueur_ecriture)	longueur_ecriture) != longueur_ecriture)
{	{
# 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 =	return;
d_es_processus;
return;
}
}	}

if (longueur_ecriture == -1)	if (longueur_ecriture == -1)
Line 3904 instruction_syseval(struct_processus *s_	Line 3884 instruction_syseval(struct_processus *s_
return;	return;
}	}

# ifndef SEMAPHORES_NOMMES	if (pthread_mutex_unlock(&((*s_etat_processus)
if (sem_post(&((*s_etat_processus)	.mutex_fork)) != 0)
.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 3920 instruction_syseval(struct_processus *s_	Line 3895 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)
{	{
# 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;
}
}	}

if (longueur_ecriture == -1)	if (longueur_ecriture == -1)
Line 3942 instruction_syseval(struct_processus *s_	Line 3909 instruction_syseval(struct_processus *s_
return;	return;
}	}

# ifndef SEMAPHORES_NOMMES	if (pthread_mutex_unlock(&((*s_etat_processus)
if (sem_post(&((*s_etat_processus)	.mutex_fork)) != 0)
.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;
}	}
}	}

# 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;
}
}	}

l_element_courant = (*l_element_courant).suivant;	l_element_courant = (*l_element_courant).suivant;
Line 3989 instruction_syseval(struct_processus *s_	Line 3945 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é
*/	*/

# ifndef SEMAPHORES_NOMMES	if (pthread_mutex_unlock(&((*s_etat_processus).mutex_fork))
if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)	!= 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 4001 instruction_syseval(struct_processus *s_	Line 3954 instruction_syseval(struct_processus *s_

if (waitpid(pid, &status, 0) == -1)	if (waitpid(pid, &status, 0) == -1)
{	{
# ifndef SEMAPHORES_NOMMES	if (pthread_mutex_lock(&((*s_etat_processus).mutex_fork))
if (sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)	!= 0)
# else
if (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;
}
}	}

(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
return;	return;
}	}

# ifndef SEMAPHORES_NOMMES	if (pthread_mutex_lock(&((*s_etat_processus).mutex_fork)) != 0)
if (sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)
# else
if (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;
}
}	}
} while((!WIFEXITED(status)) && (!WIFSIGNALED(status)));	} while((!WIFEXITED(status)) && (!WIFSIGNALED(status)));

Line 4043 instruction_syseval(struct_processus *s_	Line 3983 instruction_syseval(struct_processus *s_
return;	return;
}	}

# ifndef SEMAPHORES_NOMMES	if (pthread_mutex_unlock(&((*s_etat_processus).mutex_fork)) != 0)
if (sem_post(&((*s_etat_processus).semaphore_fork)) != 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

while((ios = read_atomic(s_etat_processus,	while((ios = read_atomic(s_etat_processus,
pipes_sortie[0], &(tampon[pointeur]),	pipes_sortie[0], &(tampon[pointeur]),
longueur_lecture)) > 0)	longueur_lecture)) > 0)
{	{
# ifndef SEMAPHORES_NOMMES	while(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;
}
}	}

tampon[pointeur + ios] = d_code_fin_chaine;	tampon[pointeur + ios] = d_code_fin_chaine;
Line 4087 instruction_syseval(struct_processus *s_	Line 4013 instruction_syseval(struct_processus *s_
return;	return;
}	}

# ifndef SEMAPHORES_NOMMES	if (pthread_mutex_unlock(&((*s_etat_processus).mutex_fork))
if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)	!= 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;
}	}
}	}

# 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 ((tampon = realloc(tampon, (strlen(tampon) + 1) *	if ((tampon = realloc(tampon, (strlen(tampon) + 1) *
Line 4250 instruction_syseval(struct_processus *s_	Line 4166 instruction_syseval(struct_processus *s_
return;	return;
}	}

# ifndef SEMAPHORES_NOMMES	if (pthread_mutex_unlock(&((*s_etat_processus).mutex_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 4271 instruction_syseval(struct_processus *s_	Line 4183 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)
{	{
# 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 (close(pipes_erreur[0]) != 0)	if (close(pipes_erreur[0]) != 0)
Line 4294 instruction_syseval(struct_processus *s_	Line 4199 instruction_syseval(struct_processus *s_
return;	return;
}	}

# 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 (close(pipes_erreur[0]) != 0)	if (close(pipes_erreur[0]) != 0)

CVSweb interface <joel.bertrand@systella.fr>

Removed from v.1.33
changed lines
	Added in v.1.38