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.110 and 1.112

version 1.110, 2019/07/16 15:17:00	version 1.112, 2019/07/19 06:53:29
Line 3459 instruction_syseval(struct_processus *s_	Line 3459 instruction_syseval(struct_processus *s_
int pipes_entree[2];	int pipes_entree[2];
int pipes_erreur[2];	int pipes_erreur[2];
int pipes_sortie[2];	int pipes_sortie[2];
int registre_ios;
int status;	int status;

file *fpipe;	file *fpipe;
Line 3485 instruction_syseval(struct_processus *s_	Line 3484 instruction_syseval(struct_processus *s_
struct_objet *s_objet_resultat;	struct_objet *s_objet_resultat;
struct_objet *s_objet_temporaire;	struct_objet *s_objet_temporaire;

	struct pollfd fds;

struct sigaction action_courante;	struct sigaction action_courante;
struct sigaction action_passee;	struct sigaction action_passee;

Line 3876 instruction_syseval(struct_processus *s_	Line 3877 instruction_syseval(struct_processus *s_
if (dup2(pipes_entree[0], STDIN_FILENO) == -1)	if (dup2(pipes_entree[0], STDIN_FILENO) == -1)
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
printf("%d\n",__LINE__);	printf("%d\n",__LINE__);
}	}
}	}

Line 3885 instruction_syseval(struct_processus *s_	Line 3886 instruction_syseval(struct_processus *s_
if (dup2(pipes_sortie[1], STDOUT_FILENO) == -1)	if (dup2(pipes_sortie[1], STDOUT_FILENO) == -1)
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
printf("%d\n",__LINE__);	printf("%d\n",__LINE__);
}	}
}	}

Line 3894 instruction_syseval(struct_processus *s_	Line 3895 instruction_syseval(struct_processus *s_
if (dup2(pipes_sortie[1], STDERR_FILENO) == -1)	if (dup2(pipes_sortie[1], STDERR_FILENO) == -1)
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
printf("%d\n",__LINE__);	printf("%d\n",__LINE__);
}	}
}	}

Line 4050 instruction_syseval(struct_processus *s_	Line 4051 instruction_syseval(struct_processus *s_
pipes_sortie[0], &(tampon[pointeur]),	pipes_sortie[0], &(tampon[pointeur]),
(size_t) longueur_lecture)) >= 0)	(size_t) longueur_lecture)) >= 0)
{	{
	if ((ios == 0) && ((*s_etat_processus)
	.var_volatile_requete_arret == 0))
	{
	// Correspond à un buffer vide en l'absence
	// d'interruption. On ne boucle pas, il n'y a rien à
	// lire.

	break;
	}

# ifndef SEMAPHORES_NOMMES	# ifndef SEMAPHORES_NOMMES
while(sem_wait(&((*s_etat_processus).semaphore_fork)) != 0)	while(sem_wait(&((*s_etat_processus).semaphore_fork)) != 0)
# else	# else
Line 4104 instruction_syseval(struct_processus *s_	Line 4115 instruction_syseval(struct_processus *s_
}	}

etape = 1;	etape = 1;
registre_ios = ios;	attente.tv_sec = 0;
	attente.tv_nsec = GRANULARITE_us * 1000;

	fds.fd = pipes_sortie[0];
	fds.events = POLLIN;

while((ios = getc(fpipe)) != EOF)	while(feof(fpipe) != 0)
{	{
	if (poll(&fds, 1, 0) > 0)
	{
	getc(fpipe);
	attente.tv_sec = 0;
	attente.tv_nsec = GRANULARITE_us * 1000;
	}
	else
	{
	nanosleep(&attente, NULL);
	INCR_GRANULARITE(attente.tv_nsec);
	}

if (etape == 1)	if (etape == 1)
{	{
gettimeofday(&horodatage_final, NULL);	gettimeofday(&horodatage_final, NULL);
Line 4127 instruction_syseval(struct_processus *s_	Line 4154 instruction_syseval(struct_processus *s_
}	}
}	}

ios = registre_ios;
break;	break;
}	}
}	}

CVSweb interface <joel.bertrand@systella.fr>

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