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.140 and 1.151

version 1.140, 2016/03/09 17:49:11	version 1.151, 2016/04/06 21:14:56
Line 1288 instruction_detach(struct_processus *s_e	Line 1288 instruction_detach(struct_processus *s_e
* Processus fils	* Processus fils
*/	*/

	// EPERM
pthread_mutex_destroy(&mutex_liste_variables_partagees);	pthread_mutex_destroy(&mutex_liste_variables_partagees);
	pthread_mutex_destroy(&mutex_liste_threads);

pthread_mutexattr_init(&attributs_mutex);	pthread_mutexattr_init(&attributs_mutex);
pthread_mutexattr_settype(&attributs_mutex, PTHREAD_MUTEX_RECURSIVE);	pthread_mutexattr_settype(&attributs_mutex, PTHREAD_MUTEX_RECURSIVE);
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);

pthread_mutex_destroy(&mutex_liste_threads);

pthread_mutexattr_init(&attributs_mutex);	pthread_mutexattr_init(&attributs_mutex);
pthread_mutexattr_settype(&attributs_mutex, PTHREAD_MUTEX_RECURSIVE);	pthread_mutexattr_settype(&attributs_mutex, PTHREAD_MUTEX_RECURSIVE);
pthread_mutex_init(&mutex_liste_threads, &attributs_mutex);	pthread_mutex_init(&mutex_liste_threads, &attributs_mutex);
Line 1305 instruction_detach(struct_processus *s_e	Line 1305 instruction_detach(struct_processus *s_e
liberation_queue_signaux(s_etat_processus);	liberation_queue_signaux(s_etat_processus);
creation_queue_signaux(s_etat_processus);	creation_queue_signaux(s_etat_processus);

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

routine_recursive = 0;	routine_recursive = 0;
	nombre_thread_surveillance_processus = 0;

(*s_etat_processus).pointeur_signal_lecture = 0;	(*s_etat_processus).pointeur_signal_lecture = 0;
(*s_etat_processus).pointeur_signal_ecriture = 0;	(*s_etat_processus).pointeur_signal_ecriture = 0;
Line 2197 instruction_detach(struct_processus *s_e	Line 2193 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 2284 instruction_detach(struct_processus *s_e	Line 2272 instruction_detach(struct_processus *s_e
{	{
envoi_signal_processus(((((struct_processus_fils *)	envoi_signal_processus(((((struct_processus_fils *)
((l_element_courant).donnee).objet)).thread).pid,	((l_element_courant).donnee).objet)).thread).pid,
rpl_sigurg);	rpl_sigurg, d_faux);
}	}
else	else
{	{
Line 2292 instruction_detach(struct_processus *s_e	Line 2280 instruction_detach(struct_processus *s_e
{	{
envoi_signal_processus(((((struct_processus_fils *)	envoi_signal_processus(((((struct_processus_fils *)
((l_element_courant).donnee).objet)).thread)	((l_element_courant).donnee).objet)).thread)
.pid, rpl_sigabort);	.pid, rpl_sigabort, d_faux);
}	}
else	else
{	{
envoi_signal_processus(((((struct_processus_fils *)	envoi_signal_processus(((((struct_processus_fils *)
((l_element_courant).donnee).objet)).thread)	((l_element_courant).donnee).objet)).thread)
.pid, rpl_sigstop);	.pid, rpl_sigstop, d_faux);
}	}
}	}
}	}
Line 2767 instruction_detach(struct_processus *s_e	Line 2755 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 2820 instruction_detach(struct_processus *s_e	Line 2806 instruction_detach(struct_processus *s_e
liberation_profil(s_etat_processus);	liberation_profil(s_etat_processus);
}	}

	attente.tv_sec = 0;
	attente.tv_nsec = GRANULARITE_us * 1000;

	while(nombre_thread_surveillance_processus != 0)
	{
	nanosleep(&attente, NULL);
	INCR_GRANULARITE(attente.tv_nsec);
	}

closelog();	closelog();

retrait_thread(s_etat_processus);	retrait_thread(s_etat_processus);
	liberation_contexte_cas(s_etat_processus);
pthread_mutex_destroy(&((*s_etat_processus).mutex_pile_processus));	destruction_queue_signaux(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 2840 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();

	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]);

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();

destruction_queue_signaux(s_etat_processus);
liberation_contexte_cas(s_etat_processus);
arret_thread_signaux(s_etat_processus);
liberation_allocateur(s_etat_processus);	liberation_allocateur(s_etat_processus);
liberation_allocateur_buffer(s_etat_processus);	liberation_allocateur_buffer(s_etat_processus);

	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(&((*s_etat_processus).mutex_allocation_buffer));
	pthread_mutex_destroy(&mutex_sections_critiques);
	pthread_mutex_destroy(&mutex_liste_variables_partagees);
	pthread_mutex_destroy(&mutex_liste_threads);

sys_free(s_etat_processus);	sys_free(s_etat_processus);

# ifdef DEBUG_MEMOIRE	# ifdef DEBUG_MEMOIRE
Line 2951 instruction_detach(struct_processus *s_e	Line 2957 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 (envoi_signal_processus((*s_argument_thread).pid, rpl_sigstart) != 0)	if (envoi_signal_processus((*s_argument_thread).pid, rpl_sigstart,
	d_vrai) != 0)
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
pthread_mutex_unlock(&((*s_etat_processus).mutex_pile_processus));	pthread_mutex_unlock(&((*s_etat_processus).mutex_pile_processus));

CVSweb interface <joel.bertrand@systella.fr>

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