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.113 and 1.143

version 1.113, 2013/06/21 14:15:53	version 1.143, 2016/03/16 11:10:47
Line 1	Line 1
/*	/*
================================================================================	================================================================================
RPL/2 (R) version 4.1.15	RPL/2 (R) version 4.1.25
Copyright (C) 1989-2013 Dr. BERTRAND Joël	Copyright (C) 1989-2016 Dr. BERTRAND Joël

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

Line 767 instruction_der(struct_processus *s_etat	Line 767 instruction_der(struct_processus *s_etat
if ((s_objet_simplifie = simplification(s_etat_processus,	if ((s_objet_simplifie = simplification(s_etat_processus,
s_objet_resultat)) == NULL)	s_objet_resultat)) == NULL)
{	{
	liberation(s_etat_processus, s_objet_resultat);
return;	return;
}	}

Line 1087 instruction_detach(struct_processus *s_e	Line 1088 instruction_detach(struct_processus *s_e
return;	return;
}	}

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

	verrouillage_threads_concurrents(s_etat_processus);

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

fflush(NULL);	fflush(NULL);

/*	/*
Line 1094 instruction_detach(struct_processus *s_e	Line 1109 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().
*/	*/

verrouillage_threads_concurrents(s_etat_processus);
(*s_argument_thread).pid = fork();	(*s_argument_thread).pid = fork();
deverrouillage_threads_concurrents(s_etat_processus);
	if (pthread_mutex_unlock(&((*s_etat_processus).mutex_allocation_buffer))
	!= 0)
	{
	(*s_etat_processus).erreur_systeme = d_es_processus;
	return;
	}

	if ((*s_argument_thread).pid > 0)
	{
	// On ne déverrouille les threads concurrents que dans le processus
	// père. Dans le fils, les valeurs sont non initialisées.
	deverrouillage_threads_concurrents(s_etat_processus);
	}

(*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 1118 instruction_detach(struct_processus *s_e	Line 1145 instruction_detach(struct_processus *s_e
* Processus père	* Processus père
*/	*/

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

if (variable_partagee == d_vrai)	if (variable_partagee == d_vrai)
{	{
liberation(s_etat_processus, s_copie);	liberation(s_etat_processus, s_copie);
Line 1255 instruction_detach(struct_processus *s_e	Line 1288 instruction_detach(struct_processus *s_e
* Processus fils	* Processus fils
*/	*/

	pthread_mutex_destroy(&mutex_liste_variables_partagees);
	pthread_mutex_destroy(&mutex_liste_threads);

	pthread_mutexattr_init(&attributs_mutex);
	pthread_mutexattr_settype(&attributs_mutex, PTHREAD_MUTEX_RECURSIVE);
	pthread_mutex_init(&mutex_liste_variables_partagees, &attributs_mutex);
	pthread_mutexattr_destroy(&attributs_mutex);

	pthread_mutexattr_init(&attributs_mutex);
	pthread_mutexattr_settype(&attributs_mutex, PTHREAD_MUTEX_RECURSIVE);
	pthread_mutex_init(&mutex_liste_threads, &attributs_mutex);
	pthread_mutexattr_destroy(&attributs_mutex);

	liberation_queue_signaux(s_etat_processus);
	creation_queue_signaux(s_etat_processus);

if (lancement_thread_signaux(s_etat_processus) != d_absence_erreur)	if (lancement_thread_signaux(s_etat_processus) != d_absence_erreur)
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
}	}

liberation_queue_signaux(s_etat_processus);
creation_queue_signaux(s_etat_processus);
routine_recursive = 0;	routine_recursive = 0;

(*s_etat_processus).pointeur_signal_lecture = 0;	(*s_etat_processus).pointeur_signal_lecture = 0;
Line 2149 instruction_detach(struct_processus *s_e	Line 2196 instruction_detach(struct_processus *s_e
}	}
}	}

close((*s_argument_thread).pipe_erreurs[1]);
close((*s_argument_thread).pipe_interruptions[1]);
close((*s_argument_thread).pipe_nombre_elements_attente[1]);
close((*s_argument_thread).pipe_objets[1]);
close((*s_argument_thread).pipe_injections[0]);
close((*s_argument_thread).pipe_nombre_injections[0]);
close((*s_argument_thread).pipe_acquittement[0]);

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

while(l_element_courant != NULL)	while(l_element_courant != NULL)
Line 2719 instruction_detach(struct_processus *s_e	Line 2758 instruction_detach(struct_processus *s_e
l_element_courant = l_element_suivant;	l_element_courant = l_element_suivant;
}	}

free((*s_etat_processus).chemin_fichiers_temporaires);

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 &
d_debug_processus) != 0)	d_debug_processus) != 0)
Line 2774 instruction_detach(struct_processus *s_e	Line 2811 instruction_detach(struct_processus *s_e

closelog();	closelog();

liberation_allocateur(s_etat_processus);	close((*s_argument_thread).pipe_erreurs[1]);
retrait_thread(s_etat_processus);	close((*s_argument_thread).pipe_interruptions[1]);
	close((*s_argument_thread).pipe_nombre_elements_attente[1]);
	close((*s_argument_thread).pipe_objets[1]);
	close((*s_argument_thread).pipe_injections[0]);
	close((*s_argument_thread).pipe_nombre_injections[0]);
	close((*s_argument_thread).pipe_acquittement[0]);

pthread_mutex_destroy(&((*s_etat_processus).mutex_pile_processus));	retrait_thread(s_etat_processus);
pthread_mutex_destroy(&((*s_etat_processus).mutex_allocation));
pthread_mutex_destroy(&((*s_etat_processus).mutex_interruptions));
pthread_mutex_destroy(&((*s_etat_processus).mutex_signaux));
pthread_mutex_destroy(&((*s_etat_processus).protection_liste_mutexes));
pthread_mutex_destroy(&mutex_sections_critiques);

# ifndef SEMAPHORES_NOMMES	# ifndef SEMAPHORES_NOMMES
sem_post(&((*s_etat_processus).semaphore_fork));	sem_post(&((*s_etat_processus).semaphore_fork));
Line 2793 instruction_detach(struct_processus *s_e	Line 2830 instruction_detach(struct_processus *s_e
pthread_self(), SEM_FORK);	pthread_self(), SEM_FORK);
# endif	# endif

	clear_history();

	liberation_contexte_cas(s_etat_processus);
	destruction_queue_signaux(s_etat_processus);

	liberation_allocateur(s_etat_processus);
	liberation_allocateur_buffer(s_etat_processus);

free((*s_etat_processus).localisation);	free((*s_etat_processus).localisation);
	free((*s_etat_processus).chemin_fichiers_temporaires);
free(s_argument_thread);	free(s_argument_thread);

clear_history();	pthread_mutex_destroy(&((*s_etat_processus).mutex_pile_processus));
	pthread_mutex_destroy(&((*s_etat_processus).mutex_allocation));
	pthread_mutex_destroy(&((*s_etat_processus).mutex_interruptions));
	pthread_mutex_destroy(&((*s_etat_processus).mutex_signaux));
	pthread_mutex_destroy(&((*s_etat_processus).protection_liste_mutexes));
	pthread_mutex_destroy(&((*s_etat_processus).mutex_allocation_buffer));
	pthread_mutex_destroy(&mutex_sections_critiques);

destruction_queue_signaux(s_etat_processus);	sys_free(s_etat_processus);
liberation_contexte_cas(s_etat_processus);
arret_thread_signaux(s_etat_processus);
free(s_etat_processus);

# ifdef DEBUG_MEMOIRE	# ifdef DEBUG_MEMOIRE
debug_memoire_verification();	debug_memoire_verification();

CVSweb interface <joel.bertrand@systella.fr>

Removed from v.1.113
changed lines
	Added in v.1.143