rpl/src/instructions_d5.c - diff

Return to instructions_d5.c CVS log

Up to [local] / rpl / src

Diff for /rpl/src/instructions_d5.c between versions 1.49.2.2 and 1.67

version 1.49.2.2, 2011/04/14 08:46:41	version 1.67, 2011/09/14 14:34:28
Line 1	Line 1
/*	/*
================================================================================	================================================================================
RPL/2 (R) version 4.0.23	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 814 instruction_der(struct_processus *s_etat	Line 814 instruction_der(struct_processus *s_etat
void	void
instruction_detach(struct_processus *s_etat_processus)	instruction_detach(struct_processus *s_etat_processus)
{	{
int status;

logical1 drapeau;	logical1 drapeau;
logical1 variable_partagee;	logical1 variable_partagee;

Line 831 instruction_detach(struct_processus *s_e	Line 829 instruction_detach(struct_processus *s_e
sig_atomic_t registre_stop;	sig_atomic_t registre_stop;

sigset_t oldset;	sigset_t oldset;
sigset_t oldset2;
sigset_t set;	sigset_t set;
sigset_t set2;

ssize_t longueur_ecriture;	ssize_t longueur_ecriture;

Line 931 instruction_detach(struct_processus *s_e	Line 927 instruction_detach(struct_processus *s_e
if (recherche_variable(s_etat_processus, (((struct_nom )	if (recherche_variable(s_etat_processus, (((struct_nom )
(*s_objet).objet)).nom) == d_vrai)	(*s_objet).objet)).nom) == d_vrai)
{	{
if ((*s_etat_processus).s_liste_variables	if (((s_etat_processus).pointeur_variable_courante).objet
[(*s_etat_processus).position_variable_courante].objet
== NULL)	== NULL)
{	{
if (pthread_mutex_lock(&(((s_etat_processus)	if (pthread_mutex_lock(&(((s_etat_processus)
Line 943 instruction_detach(struct_processus *s_e	Line 938 instruction_detach(struct_processus *s_e
}	}

if (recherche_variable_partagee(s_etat_processus,	if (recherche_variable_partagee(s_etat_processus,
(*s_etat_processus).s_liste_variables	((s_etat_processus).pointeur_variable_courante).nom,
[(*s_etat_processus).position_variable_courante].nom,	((s_etat_processus).pointeur_variable_courante)
(*s_etat_processus).s_liste_variables	.variable_partagee, ((s_etat_processus)
[(*s_etat_processus).position_variable_courante]	.pointeur_variable_courante).origine) == d_faux)
.variable_partagee, (*s_etat_processus)
.s_liste_variables[(*s_etat_processus)
.position_variable_courante].origine) == d_faux)
{	{
if (pthread_mutex_unlock(&(((s_etat_processus)	if (pthread_mutex_unlock(&(((s_etat_processus)
.s_liste_variables_partagees).mutex)) != 0)	.s_liste_variables_partagees).mutex)) != 0)
Line 1017 instruction_detach(struct_processus *s_e	Line 1009 instruction_detach(struct_processus *s_e
}	}
else	else
{	{
if ((((s_etat_processus).s_liste_variables	if (((((*s_etat_processus).pointeur_variable_courante).objet)
[(*s_etat_processus).position_variable_courante].objet)	.type != RPN) && ((((*s_etat_processus)
.type != RPN) && (((s_etat_processus)	.pointeur_variable_courante).objet).type != ADR))
.s_liste_variables[(*s_etat_processus)
.position_variable_courante].objet).type != ADR))
{	{
liberation(s_etat_processus, s_objet);	liberation(s_etat_processus, s_objet);

Line 1041 instruction_detach(struct_processus *s_e	Line 1031 instruction_detach(struct_processus *s_e
}	}
}	}

if (sigemptyset(&set) != 0)
{
(*s_etat_processus).erreur_systeme = d_es_processus;
return;
}

if (sigaddset(&set, SIGSTART) != 0)
{
(*s_etat_processus).erreur_systeme = d_es_processus;
return;
}

/*
* Le signal SIGFSTOP doit être traité !
*/

if (sigaddset(&set, SIGFSTOP) != 0)
{
(*s_etat_processus).erreur_systeme = d_es_processus;
return;
}

if (sigaddset(&set, SIGFABORT) != 0)
{
(*s_etat_processus).erreur_systeme = d_es_processus;
return;
}

if (sigaddset(&set, SIGURG) != 0)
{
(*s_etat_processus).erreur_systeme = d_es_processus;
return;
}

if (pthread_sigmask(SIG_BLOCK, &set, &oldset) != 0)
{
(*s_etat_processus).erreur_systeme = d_es_processus;
return;
}

if ((s_argument_thread = malloc(sizeof(struct_descripteur_thread))) == NULL)	if ((s_argument_thread = malloc(sizeof(struct_descripteur_thread))) == NULL)
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
Line 1154 instruction_detach(struct_processus *s_e	Line 1104 instruction_detach(struct_processus *s_e
* de mémoire, ni libération, ni copie d'objet concurrent au fork().	* de mémoire, ni libération, ni copie d'objet concurrent au fork().
*/	*/

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

verrouillage_threads_concurrents(s_etat_processus);	verrouillage_threads_concurrents(s_etat_processus);
(*s_argument_thread).pid = fork();	(*s_argument_thread).pid = fork();
deverrouillage_threads_concurrents(s_etat_processus);	deverrouillage_threads_concurrents(s_etat_processus);
	pthread_sigmask(SIG_SETMASK, &oldset, NULL);
pthread_sigmask(SIG_SETMASK, &oldset2, NULL);	sigpending(&set);
sigpending(&set2);

(*s_argument_thread).thread_pere = pthread_self();	(*s_argument_thread).thread_pere = pthread_self();
(*s_argument_thread).processus_detache = d_vrai;	(*s_argument_thread).processus_detache = d_vrai;
Line 1325 instruction_detach(struct_processus *s_e	Line 1273 instruction_detach(struct_processus *s_e
* Processus fils	* Processus fils
*/	*/

# ifdef _BROKEN_SIGINFO	liberation_queue_signaux(s_etat_processus);
liberation_fifos_signaux(s_etat_processus);	creation_queue_signaux(s_etat_processus);
creation_fifos_signaux(s_etat_processus);
# endif	(*s_etat_processus).pointeur_signal_lecture = 0;
	(*s_etat_processus).pointeur_signal_ecriture = 0;
	(*s_etat_processus).tid_courant = pthread_self();

if ((*s_etat_processus).debug == d_vrai)	if ((*s_etat_processus).debug == d_vrai)
if (((*s_etat_processus).type_debug &	if (((*s_etat_processus).type_debug &
Line 1519 instruction_detach(struct_processus *s_e	Line 1469 instruction_detach(struct_processus *s_e
}	}
}	}

# ifdef _BROKEN_SIGINFO	destruction_queue_signaux(s_etat_processus);
destruction_fifos_signaux(s_etat_processus);
# endif

BUG(1, uprintf("Process management error line %d\n", __LINE__));	BUG(1, uprintf("Process management error line %d\n", __LINE__));
exit(EXIT_FAILURE);	exit(EXIT_FAILURE);
}	}
Line 1553 instruction_detach(struct_processus *s_e	Line 1500 instruction_detach(struct_processus *s_e
}	}
}	}

# ifdef _BROKEN_SIGINFO	destruction_queue_signaux(s_etat_processus);
destruction_fifos_signaux(s_etat_processus);
# endif

BUG(1, uprintf("Process management error line %d\n", __LINE__));	BUG(1, uprintf("Process management error line %d\n", __LINE__));
exit(EXIT_FAILURE);	exit(EXIT_FAILURE);
}	}
Line 1590 instruction_detach(struct_processus *s_e	Line 1534 instruction_detach(struct_processus *s_e
}	}
}	}

# ifdef _BROKEN_SIGINFO	destruction_queue_signaux(s_etat_processus);
destruction_fifos_signaux(s_etat_processus);
# endif

BUG(1, uprintf("Process management error line %d\n", __LINE__));	BUG(1, uprintf("Process management error line %d\n", __LINE__));
exit(EXIT_FAILURE);	exit(EXIT_FAILURE);
}	}
Line 1652 instruction_detach(struct_processus *s_e	Line 1593 instruction_detach(struct_processus *s_e
* renseignée.	* renseignée.
*/	*/

if (sigpending(&set) != 0)	// Attente de la réception du signal rpl_sigstart.
{
(*s_etat_processus).erreur_systeme = d_es_processus;	for((*s_etat_processus).demarrage_fils = d_faux;;)
}
else if (sigismember(&set, SIGSTART) == 0)
{	{
while(sigismember(&set, SIGSTART) == 0)	scrutation_interruptions(s_etat_processus);
{
if (sigpending(&set) != 0)
{
(*s_etat_processus).erreur_systeme = d_es_processus;
}

nanosleep(&attente, NULL);	if ((*s_etat_processus).demarrage_fils == d_vrai)
	{
	break;
}	}

	nanosleep(&attente, NULL);
}	}

(s_etat_processus).niveau_initial = (s_etat_processus).niveau_courant;	(s_etat_processus).niveau_initial = (s_etat_processus).niveau_courant;
Line 1743 instruction_detach(struct_processus *s_e	Line 1681 instruction_detach(struct_processus *s_e
}	}
}	}

# ifdef _BROKEN_SIGINFO	destruction_queue_signaux(s_etat_processus);
destruction_fifos_signaux(s_etat_processus);
# endif

BUG(1, uprintf("Process management error line %d\n", __LINE__));	BUG(1, uprintf("Process management error line %d\n", __LINE__));
exit(EXIT_FAILURE);	exit(EXIT_FAILURE);
}	}
Line 1763 instruction_detach(struct_processus *s_e	Line 1698 instruction_detach(struct_processus *s_e
(*s_argument_thread2).nombre_references--;	(*s_argument_thread2).nombre_references--;

BUG((*s_argument_thread2).nombre_references < 0,	BUG((*s_argument_thread2).nombre_references < 0,
# ifdef _BROKEN_SIGINFO	destruction_queue_signaux(s_etat_processus),
destruction_fifos_signaux(s_etat_processus),
# endif
printf("(*s_argument_thread2).nombre_references = %d\n",	printf("(*s_argument_thread2).nombre_references = %d\n",
(int) (*s_argument_thread2).nombre_references));	(int) (*s_argument_thread2).nombre_references));

Line 1829 instruction_detach(struct_processus *s_e	Line 1762 instruction_detach(struct_processus *s_e
}	}
}	}

# ifdef _BROKEN_SIGINFO	destruction_queue_signaux(s_etat_processus);
destruction_fifos_signaux(s_etat_processus);
# endif

BUG(1, uprintf("Process management error line %d\n", __LINE__));	BUG(1, uprintf("Process management error line %d\n", __LINE__));
exit(EXIT_FAILURE);	exit(EXIT_FAILURE);
}	}
Line 1897 instruction_detach(struct_processus *s_e	Line 1827 instruction_detach(struct_processus *s_e
}	}
}	}

# ifdef _BROKEN_SIGINFO	destruction_queue_signaux(s_etat_processus);
destruction_fifos_signaux(s_etat_processus);
# endif

BUG(1, uprintf("Process management error line %d\n", __LINE__));	BUG(1, uprintf("Process management error line %d\n", __LINE__));
exit(EXIT_FAILURE);	exit(EXIT_FAILURE);
}	}
Line 1953 instruction_detach(struct_processus *s_e	Line 1880 instruction_detach(struct_processus *s_e
}	}
}	}

# ifdef _BROKEN_SIGINFO	destruction_queue_signaux(s_etat_processus);
destruction_fifos_signaux(s_etat_processus);
# endif

BUG(1, uprintf("Process management error line %d\n", __LINE__));	BUG(1, uprintf("Process management error line %d\n", __LINE__));
exit(EXIT_FAILURE);	exit(EXIT_FAILURE);
}	}
Line 2057 instruction_detach(struct_processus *s_e	Line 1981 instruction_detach(struct_processus *s_e

(*s_etat_processus).s_fichiers = NULL;	(*s_etat_processus).s_fichiers = NULL;

if (pthread_sigmask(SIG_SETMASK, &oldset, NULL) != 0)
{
(*s_etat_processus).erreur_systeme = d_es_processus;
}

sigpending(&set);

if ((*s_etat_processus).debug == d_vrai)	if ((*s_etat_processus).debug == d_vrai)
{	{
if (((*s_etat_processus).type_debug & d_debug_processus)	if (((*s_etat_processus).type_debug & d_debug_processus)
Line 2082 instruction_detach(struct_processus *s_e	Line 1999 instruction_detach(struct_processus *s_e

if ((*s_etat_processus).erreur_systeme == d_es)	if ((*s_etat_processus).erreur_systeme == d_es)
{	{
if (variable_partagee == d_faux)	if (setjmp(contexte_processus) == 0)
{	{
if (evaluation(s_etat_processus, s_objet, 'E') == d_erreur)	if (variable_partagee == d_faux)
{
if (((*s_etat_processus).erreur_execution == d_ex) &&
((*s_etat_processus).erreur_systeme == d_es))
{
(*s_etat_processus).erreur_execution =
d_ex_erreur_evaluation;
}
}
else
{	{
if (((*s_etat_processus).var_volatile_alarme == 0)	if (evaluation(s_etat_processus, s_objet, 'E') == d_erreur)
&& ((*s_etat_processus).arret_depuis_abort == 0)
&& ((*s_etat_processus).at_exit != NULL))
{	{
(*s_etat_processus).var_volatile_requete_arret = 0;	if (((*s_etat_processus).erreur_execution == d_ex) &&
	((*s_etat_processus).erreur_systeme == d_es))
if (evaluation(s_etat_processus,
(*s_etat_processus).at_exit, 'E') == d_erreur)
{	{
(*s_etat_processus).erreur_execution =	(*s_etat_processus).erreur_execution =
d_ex_erreur_evaluation;	d_ex_erreur_evaluation;
}	}
}	}
}	else
}
else
{
if (evaluation(s_etat_processus, s_copie, 'E') == d_erreur)
{
if (((*s_etat_processus).erreur_execution == d_ex) &&
((*s_etat_processus).erreur_systeme == d_es))
{	{
(*s_etat_processus).erreur_execution =	if (((*s_etat_processus).var_volatile_alarme == 0)
d_ex_erreur_evaluation;	&& ((*s_etat_processus).arret_depuis_abort == 0)
	&& ((*s_etat_processus).at_exit != NULL))
	{
	(*s_etat_processus).var_volatile_requete_arret = 0;

	if (evaluation(s_etat_processus,
	(*s_etat_processus).at_exit, 'E') ==
	d_erreur)
	{
	(*s_etat_processus).erreur_execution =
	d_ex_erreur_evaluation;
	}
	}
}	}
}	}
else	else
{	{
if ((*s_etat_processus).at_exit != NULL)	if (evaluation(s_etat_processus, s_copie, 'E') == d_erreur)
{	{
(*s_etat_processus).var_volatile_requete_arret = 0;	if (((*s_etat_processus).erreur_execution == d_ex) &&
	((*s_etat_processus).erreur_systeme == d_es))
if (evaluation(s_etat_processus,
(*s_etat_processus).at_exit, 'E') == d_erreur)
{	{
(*s_etat_processus).erreur_execution =	(*s_etat_processus).erreur_execution =
d_ex_erreur_evaluation;	d_ex_erreur_evaluation;
}	}
}	}
}	else
	{
	if ((*s_etat_processus).at_exit != NULL)
	{
	(*s_etat_processus).var_volatile_requete_arret = 0;

	if (evaluation(s_etat_processus,
	(*s_etat_processus).at_exit, 'E') ==
	d_erreur)
	{
	(*s_etat_processus).erreur_execution =
	d_ex_erreur_evaluation;
	}
	}
	}

liberation(s_etat_processus, s_copie);	liberation(s_etat_processus, s_copie);
	}
}	}
}	}

Line 2363 instruction_detach(struct_processus *s_e	Line 2285 instruction_detach(struct_processus *s_e

if ((*s_etat_processus).var_volatile_alarme != 0)	if ((*s_etat_processus).var_volatile_alarme != 0)
{	{
kill(((((struct_processus_fils *)	envoi_signal_processus(((((struct_processus_fils *)
((l_element_courant).donnee).objet)).thread).pid,	((l_element_courant).donnee).objet)).thread).pid,
SIGURG);	rpl_sigurg);
}	}
else	else
{	{
if ((*s_etat_processus).arret_depuis_abort == -1)	if ((*s_etat_processus).arret_depuis_abort == -1)
{	{
kill(((((struct_processus_fils *)	envoi_signal_processus(((((struct_processus_fils *)
((l_element_courant).donnee).objet)).thread)	((l_element_courant).donnee).objet)).thread)
.pid, SIGFABORT);	.pid, rpl_sigabort);
}	}
else	else
{	{
kill(((((struct_processus_fils *)	envoi_signal_processus(((((struct_processus_fils *)
((l_element_courant).donnee).objet)).thread)	((l_element_courant).donnee).objet)).thread)
.pid, SIGFSTOP);	.pid, rpl_sigstop);
}	}
}	}
}	}
Line 2421 instruction_detach(struct_processus *s_e	Line 2343 instruction_detach(struct_processus *s_e
{	{
if ((*s_etat_processus).var_volatile_alarme != 0)	if ((*s_etat_processus).var_volatile_alarme != 0)
{	{
pthread_kill(((((struct_processus_fils *)	envoi_signal_thread(((((struct_processus_fils *)
((l_element_courant).donnee).objet)).thread)	((l_element_courant).donnee).objet)).thread)
.tid, SIGURG);	.tid, rpl_sigurg);
}	}
else	else
{	{
if ((*s_etat_processus).arret_depuis_abort == -1)	if ((*s_etat_processus).arret_depuis_abort == -1)
{	{
pthread_kill(((((struct_processus_fils *)	envoi_signal_thread(((((struct_processus_fils *)
((l_element_courant).donnee).objet))	((l_element_courant).donnee).objet))
.thread).tid, SIGFABORT);	.thread).tid, rpl_sigabort);
}	}
else	else
{	{
pthread_kill(((((struct_processus_fils *)	envoi_signal_thread(((((struct_processus_fils *)
((l_element_courant).donnee).objet))	((l_element_courant).donnee).objet))
.thread).tid, SIGFSTOP);	.thread).tid, rpl_sigstop);
}	}
}	}
}	}
Line 2461 instruction_detach(struct_processus *s_e	Line 2383 instruction_detach(struct_processus *s_e

while((*s_etat_processus).l_base_pile_processus != NULL)	while((*s_etat_processus).l_base_pile_processus != NULL)
{	{
status = 0;

l_element_courant = (struct_liste_chainee *)	l_element_courant = (struct_liste_chainee *)
(*s_etat_processus).l_base_pile_processus;	(*s_etat_processus).l_base_pile_processus;

Line 2505 instruction_detach(struct_processus *s_e	Line 2425 instruction_detach(struct_processus *s_e
registre_stop;	registre_stop;
}	}

# ifdef _BROKEN_SIGINFO	destruction_queue_signaux(s_etat_processus);
destruction_fifos_signaux(s_etat_processus);
# endif

(*s_etat_processus).erreur_systeme = d_es_signal;	(*s_etat_processus).erreur_systeme = d_es_signal;
exit(EXIT_FAILURE);	exit(EXIT_FAILURE);
}	}
Line 2543 instruction_detach(struct_processus *s_e	Line 2460 instruction_detach(struct_processus *s_e

if (sigaction(SIGPIPE, &registre, NULL) != 0)	if (sigaction(SIGPIPE, &registre, NULL) != 0)
{	{
# ifdef _BROKEN_SIGINFO	destruction_queue_signaux(s_etat_processus);
destruction_fifos_signaux(s_etat_processus);
# endif

pthread_mutex_unlock(&((*s_etat_processus).mutex));	pthread_mutex_unlock(&((*s_etat_processus).mutex));

(*s_etat_processus).erreur_systeme = d_es_signal;	(*s_etat_processus).erreur_systeme = d_es_signal;
exit(EXIT_FAILURE);	exit(EXIT_FAILURE);
}	}
Line 2688 instruction_detach(struct_processus *s_e	Line 2602 instruction_detach(struct_processus *s_e
(*s_etat_processus).instruction_derniere_erreur = NULL;	(*s_etat_processus).instruction_derniere_erreur = NULL;
}	}

for(i = 0; i < (*s_etat_processus).nombre_variables; i++)	liberation_arbre_variables(s_etat_processus,
{	(*s_etat_processus).s_arbre_variables, d_vrai);
liberation(s_etat_processus,	free((*s_etat_processus).pointeurs_caracteres_variables);
(*s_etat_processus).s_liste_variables[i].objet);
free((*s_etat_processus).s_liste_variables[i].nom);
}

free((*s_etat_processus).s_liste_variables);

for(i = 0; i < (*s_etat_processus).nombre_variables_statiques; i++)	for(i = 0; i < (*s_etat_processus).nombre_variables_statiques; i++)
{	{
Line 2934 instruction_detach(struct_processus *s_e	Line 2843 instruction_detach(struct_processus *s_e

clear_history();	clear_history();

# ifdef _BROKEN_SIGINFO	destruction_queue_signaux(s_etat_processus);
destruction_fifos_signaux(s_etat_processus);	liberation_contexte_cas(s_etat_processus);
# endif

free(s_etat_processus);	free(s_etat_processus);

# ifdef DEBUG_MEMOIRE	# ifdef DEBUG_MEMOIRE
Line 3036 instruction_detach(struct_processus *s_e	Line 2943 instruction_detach(struct_processus *s_e

// Le fils peut être présent sans être en attente du signal de départ.	// Le fils peut être présent sans être en attente du signal de départ.

if (kill((*s_argument_thread).pid, SIGSTART) != 0)	if (envoi_signal_processus((*s_argument_thread).pid, rpl_sigstart) != 0)
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
pthread_mutex_unlock(&((*s_etat_processus).mutex));	pthread_mutex_unlock(&((*s_etat_processus).mutex));
return;	return;
}	}

if (pthread_sigmask(SIG_SETMASK, &oldset, NULL) != 0)
{
(*s_etat_processus).erreur_systeme = d_es_processus;
pthread_mutex_unlock(&((*s_etat_processus).mutex));
return;
}

sigpending(&set);

if (pthread_mutex_unlock(&((*s_etat_processus).mutex)) != 0)	if (pthread_mutex_unlock(&((*s_etat_processus).mutex)) != 0)
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;

CVSweb interface <joel.bertrand@systella.fr>

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