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.67 and 1.99

version 1.67, 2013/04/01 15:29:37	version 1.99, 2019/02/07 21:44:15
Line 1	Line 1
/*	/*
================================================================================	================================================================================
RPL/2 (R) version 4.1.14	RPL/2 (R) version 4.1.31
Copyright (C) 1989-2013 Dr. BERTRAND Joël	Copyright (C) 1989-2019 Dr. BERTRAND Joël

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

Line 59 instruction_swap(struct_processus *s_eta	Line 59 instruction_swap(struct_processus *s_eta
" %s, %s, %s, %s, %s,\n"	" %s, %s, %s, %s, %s,\n"
" %s, %s, %s, %s, %s,\n"	" %s, %s, %s, %s, %s,\n"
" %s, %s, %s, %s, %s,\n"	" %s, %s, %s, %s, %s,\n"
" %s\n",	" %s, %s\n",
d_INT, d_REL, d_CPL, d_VIN, d_VRL, d_VCX, d_MIN, d_MRL, d_MCX,	d_INT, d_REL, d_CPL, d_VIN, d_VRL, d_VCX, d_MIN, d_MRL, d_MCX,
d_TAB, d_BIN, d_NOM, d_CHN, d_LST, d_ALG, d_RPN, d_FCH, d_SCK,	d_TAB, d_BIN, d_NOM, d_CHN, d_LST, d_ALG, d_RPN, d_FCH, d_SCK,
d_SLB, d_PRC, d_MTX, d_SQL);	d_SLB, d_PRC, d_MTX, d_SQL, d_REC);
printf(" 1: %s, %s, %s, %s, %s, %s,\n"	printf(" 1: %s, %s, %s, %s, %s, %s,\n"
" %s, %s, %s, %s, %s,\n"	" %s, %s, %s, %s, %s,\n"
" %s, %s, %s, %s, %s,\n"	" %s, %s, %s, %s, %s,\n"
" %s, %s, %s, %s, %s,\n"	" %s, %s, %s, %s, %s,\n"
" %s\n",	" %s, %s\n",
d_INT, d_REL, d_CPL, d_VIN, d_VRL, d_VCX, d_MIN, d_MRL, d_MCX,	d_INT, d_REL, d_CPL, d_VIN, d_VRL, d_VCX, d_MIN, d_MRL, d_MCX,
d_TAB, d_BIN, d_NOM, d_CHN, d_LST, d_ALG, d_RPN, d_FCH, d_SCK,	d_TAB, d_BIN, d_NOM, d_CHN, d_LST, d_ALG, d_RPN, d_FCH, d_SCK,
d_SLB, d_PRC, d_MTX, d_SQL);	d_SLB, d_PRC, d_MTX, d_SQL, d_REC);
printf("-> 2: %s, %s, %s, %s, %s, %s,\n"	printf("-> 2: %s, %s, %s, %s, %s, %s,\n"
" %s, %s, %s, %s, %s,\n"	" %s, %s, %s, %s, %s,\n"
" %s, %s, %s, %s, %s,\n"	" %s, %s, %s, %s, %s,\n"
" %s, %s, %s, %s, %s,\n"	" %s, %s, %s, %s, %s,\n"
" %s\n",	" %s, %s\n",
d_INT, d_REL, d_CPL, d_VIN, d_VRL, d_VCX, d_MIN, d_MRL, d_MCX,	d_INT, d_REL, d_CPL, d_VIN, d_VRL, d_VCX, d_MIN, d_MRL, d_MCX,
d_TAB, d_BIN, d_NOM, d_CHN, d_LST, d_ALG, d_RPN, d_FCH, d_SCK,	d_TAB, d_BIN, d_NOM, d_CHN, d_LST, d_ALG, d_RPN, d_FCH, d_SCK,
d_SLB, d_PRC, d_MTX, d_SQL);	d_SLB, d_PRC, d_MTX, d_SQL, d_REC);
printf(" 1: %s, %s, %s, %s, %s, %s,\n"	printf(" 1: %s, %s, %s, %s, %s, %s,\n"
" %s, %s, %s, %s, %s,\n"	" %s, %s, %s, %s, %s,\n"
" %s, %s, %s, %s, %s,\n"	" %s, %s, %s, %s, %s,\n"
" %s, %s, %s, %s, %s,\n"	" %s, %s, %s, %s, %s,\n"
" %s\n",	" %s, %s\n",
d_INT, d_REL, d_CPL, d_VIN, d_VRL, d_VCX, d_MIN, d_MRL, d_MCX,	d_INT, d_REL, d_CPL, d_VIN, d_VRL, d_VCX, d_MIN, d_MRL, d_MCX,
d_TAB, d_BIN, d_NOM, d_CHN, d_LST, d_ALG, d_RPN, d_FCH, d_SCK,	d_TAB, d_BIN, d_NOM, d_CHN, d_LST, d_ALG, d_RPN, d_FCH, d_SCK,
d_SLB, d_PRC, d_MTX, d_SQL);	d_SLB, d_PRC, d_MTX, d_SQL, d_REC);

return;	return;
}	}
Line 3155 instruction_sto(struct_processus *s_etat	Line 3155 instruction_sto(struct_processus *s_etat
" %s, %s, %s, %s, %s,\n"	" %s, %s, %s, %s, %s,\n"
" %s, %s, %s, %s, %s,\n"	" %s, %s, %s, %s, %s,\n"
" %s, %s, %s, %s, %s,\n"	" %s, %s, %s, %s, %s,\n"
" %s\n",	" %s, %s\n",
d_INT, d_REL, d_CPL, d_VIN, d_VRL, d_VCX, d_MIN, d_MRL, d_MCX,	d_INT, d_REL, d_CPL, d_VIN, d_VRL, d_VCX, d_MIN, d_MRL, d_MCX,
d_TAB, d_BIN, d_NOM, d_CHN, d_LST, d_ALG, d_RPN, d_FCH, d_SCK,	d_TAB, d_BIN, d_NOM, d_CHN, d_LST, d_ALG, d_RPN, d_FCH, d_SCK,
d_SLB, d_PRC, d_MTX, d_SQL);	d_SLB, d_PRC, d_MTX, d_SQL, d_REC);
printf(" 1: %s\n", d_NOM);	printf(" 1: %s\n", d_NOM);

return;	return;
Line 3415 instruction_syseval(struct_processus *s_	Line 3415 instruction_syseval(struct_processus *s_
unsigned char *tampon;	unsigned char *tampon;

integer8 longueur_lecture;	integer8 longueur_lecture;
	integer8 longueur_lue;
integer8 longueur_tampon;	integer8 longueur_tampon;
integer8 nombre_iterations;
integer8 nombre_lignes;	integer8 nombre_lignes;
integer8 pointeur;	integer8 pointeur;
integer8 registre_position_courante;	integer8 registre_position_courante;
Line 3689 instruction_syseval(struct_processus *s_	Line 3689 instruction_syseval(struct_processus *s_
fflush(NULL);	fflush(NULL);

verrouillage_threads_concurrents(s_etat_processus);	verrouillage_threads_concurrents(s_etat_processus);

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

if (pid < 0)	if (pid < 0)
{	{
Line 3735 instruction_syseval(struct_processus *s_	Line 3735 instruction_syseval(struct_processus *s_
}	}
else if (pid == 0)	else if (pid == 0)
{	{
	(*s_etat_processus).erreur_systeme = d_es;

if (close(pipes_entree[1]) != 0)	if (close(pipes_entree[1]) != 0)
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
Line 3820 instruction_syseval(struct_processus *s_	Line 3822 instruction_syseval(struct_processus *s_
}	}
else	else
{	{
	deverrouillage_threads_concurrents(s_etat_processus);

if (close(pipes_entree[0]) != 0)	if (close(pipes_entree[0]) != 0)
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
Line 3964 instruction_syseval(struct_processus *s_	Line 3968 instruction_syseval(struct_processus *s_
return;	return;
}	}

do	longueur_lecture = 65536;
{	longueur_lue = 0;
if (kill(pid, 0) != 0)
{
break;
}

/*
* Récupération de la valeur de retour du processus détaché
*/

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

if (waitpid(pid, &status, 0) == -1)
{
# 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;
return;
}

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

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

longueur_lecture = 256;
pointeur = 0;	pointeur = 0;
nombre_iterations = 1;

if ((tampon = malloc(((size_t) (longueur_lecture + 1)) *	if ((tampon = malloc(((size_t) (longueur_lecture + 1)) *
sizeof(unsigned char))) == NULL)	sizeof(unsigned char))) == NULL)
Line 4053 instruction_syseval(struct_processus *s_	Line 4005 instruction_syseval(struct_processus *s_
return;	return;
}	}

	longueur_lue += ios;
tampon[pointeur + ios] = d_code_fin_chaine;	tampon[pointeur + ios] = d_code_fin_chaine;
pointeur += longueur_lecture;	pointeur += ios;
nombre_iterations++;

if ((tampon = realloc(tampon,	if ((tampon = realloc(tampon,
((size_t) ((nombre_iterations * longueur_lecture) + 1))	((size_t) ((longueur_lue + longueur_lecture) + 1))
* sizeof(unsigned char))) == NULL)	* sizeof(unsigned char))) == NULL)
{	{
(*s_etat_processus).erreur_systeme =	(*s_etat_processus).erreur_systeme =
Line 4078 instruction_syseval(struct_processus *s_	Line 4030 instruction_syseval(struct_processus *s_
}	}

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

	do
	{
	if (kill(pid, 0) != 0)
	{
	// Le processus n'existe plus.
	break;
	}

	/*
	* Récupération de la valeur de retour du processus détaché
	*/

	# 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;
}	}
}
	while(waitpid(pid, &status, 0) == -1)
	{
	if (errno != EINTR)
	{
	(*s_etat_processus).erreur_systeme = d_es_processus;
	return;
	}
	}

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

if (ios == -1)	if (ios == -1)
{	{
Line 4213 instruction_syseval(struct_processus *s_	Line 4207 instruction_syseval(struct_processus *s_
liberation(s_etat_processus, s_objet_temporaire);	liberation(s_etat_processus, s_objet_temporaire);
}	}

	free(arguments);

if ((tampon = malloc(sizeof(unsigned char))) == NULL)	if ((tampon = malloc(sizeof(unsigned char))) == NULL)
{	{
(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;	(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;
Line 4282 instruction_syseval(struct_processus *s_	Line 4278 instruction_syseval(struct_processus *s_
return;	return;
}	}

free(arguments);
free(tampon);	free(tampon);
}	}
else	else

CVSweb interface <joel.bertrand@systella.fr>

Removed from v.1.67
changed lines
	Added in v.1.99