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.134 and 1.140

version 1.134, 2015/10/22 18:37:09	version 1.140, 2016/03/09 17:49:11
Line 1	Line 1
/*	/*
================================================================================	================================================================================
RPL/2 (R) version 4.1.23	RPL/2 (R) version 4.1.25
Copyright (C) 1989-2015 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 1094 instruction_detach(struct_processus *s_e	Line 1094 instruction_detach(struct_processus *s_e
return;	return;
}	}

	verrouillage_threads_concurrents(s_etat_processus);

if (pthread_mutex_lock(&((*s_etat_processus).mutex_allocation_buffer)) != 0)	if (pthread_mutex_lock(&((*s_etat_processus).mutex_allocation_buffer)) != 0)
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
Line 1107 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))	if (pthread_mutex_unlock(&((*s_etat_processus).mutex_allocation_buffer))
!= 0)	!= 0)
Line 1118 instruction_detach(struct_processus *s_e	Line 1118 instruction_detach(struct_processus *s_e
return;	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 1288 instruction_detach(struct_processus *s_e	Line 1295 instruction_detach(struct_processus *s_e
pthread_mutex_init(&mutex_liste_variables_partagees, &attributs_mutex);	pthread_mutex_init(&mutex_liste_variables_partagees, &attributs_mutex);
pthread_mutexattr_destroy(&attributs_mutex);	pthread_mutexattr_destroy(&attributs_mutex);

// Remplacement des mutexes des variables partagées.	pthread_mutex_destroy(&mutex_liste_threads);
reinitialisation_mutexes_variables_partagees(s_etat_processus);
	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);	liberation_queue_signaux(s_etat_processus);
creation_queue_signaux(s_etat_processus);	creation_queue_signaux(s_etat_processus);

CVSweb interface <joel.bertrand@systella.fr>

Removed from v.1.134
changed lines
	Added in v.1.140