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.158 and 1.178

version 1.158, 2017/08/02 14:41:35	version 1.178, 2023/11/22 10:55:15
Line 1	Line 1
/*	/*
================================================================================	================================================================================
RPL/2 (R) version 4.1.27	RPL/2 (R) version 4.1.35
Copyright (C) 1989-2017 Dr. BERTRAND Joël	Copyright (C) 1989-2023 Dr. BERTRAND Joël

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

Line 815 instruction_der(struct_processus *s_etat	Line 815 instruction_der(struct_processus *s_etat
void	void
instruction_detach(struct_processus *s_etat_processus)	instruction_detach(struct_processus *s_etat_processus)
{	{
#ifndef EXPERIMENTAL_CODE
printf("DETACH currently broken is replaced by SPAWN...\n");
instruction_spawn(s_etat_processus);
#else
int pipe_initialisation_segment_signaux[2];	int pipe_initialisation_segment_signaux[2];

logical1 drapeau;	logical1 drapeau;
Line 1299 instruction_detach(struct_processus *s_e	Line 1295 instruction_detach(struct_processus *s_e
pthread_mutex_destroy(&((*s_etat_processus).mutex_pile_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_allocation));
#endif	#endif

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);
Line 1311 instruction_detach(struct_processus *s_e	Line 1306 instruction_detach(struct_processus *s_e
pthread_mutexattr_destroy(&attributs_mutex);	pthread_mutexattr_destroy(&attributs_mutex);

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

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

	pthread_mutexattr_init(&attributs_mutex);
pthread_mutexattr_settype(&attributs_mutex, PTHREAD_MUTEX_NORMAL);	pthread_mutexattr_settype(&attributs_mutex, PTHREAD_MUTEX_NORMAL);
pthread_mutex_init(&((*s_etat_processus).mutex_pile_processus),	pthread_mutex_init(&((*s_etat_processus).mutex_pile_processus),
&attributs_mutex);	&attributs_mutex);
Line 1326 instruction_detach(struct_processus *s_e	Line 1331 instruction_detach(struct_processus *s_e
creation_queue_signaux(s_etat_processus);	creation_queue_signaux(s_etat_processus);

routine_recursive = 0;	routine_recursive = 0;
nombre_thread_surveillance_processus = 0;	nombre_threads_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 1338 instruction_detach(struct_processus *s_e	Line 1343 instruction_detach(struct_processus *s_e
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
}	}

close(pipe_initialisation_segment_signaux[0]);
close(pipe_initialisation_segment_signaux[1]);	close(pipe_initialisation_segment_signaux[1]);

if ((*s_etat_processus).debug == d_vrai)	if ((*s_etat_processus).debug == d_vrai)
Line 1429 instruction_detach(struct_processus *s_e	Line 1433 instruction_detach(struct_processus *s_e
(*s_argument_thread).pipe_nombre_elements_attente[1],	(*s_argument_thread).pipe_nombre_elements_attente[1],
&caractere, sizeof(caractere)) != sizeof(caractere))	&caractere, sizeof(caractere)) != sizeof(caractere))
{	{
pthread_mutex_unlock(&((*s_etat_processus).mutex_pile_processus));
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;

while((longueur_ecriture = write_atomic(s_etat_processus,	while((longueur_ecriture = write_atomic(s_etat_processus,
Line 1471 instruction_detach(struct_processus *s_e	Line 1474 instruction_detach(struct_processus *s_e
pthread_mutex_init(&mutex_sections_critiques, &attributs_mutex);	pthread_mutex_init(&mutex_sections_critiques, &attributs_mutex);
pthread_mutexattr_destroy(&attributs_mutex);	pthread_mutexattr_destroy(&attributs_mutex);

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

caractere = 0;

while((longueur_ecriture = write_atomic(s_etat_processus,
(*s_argument_thread).pipe_nombre_elements_attente[1],
&caractere, sizeof(caractere))) != sizeof(caractere))
{
if (longueur_ecriture == -1)
{
break;
}
}

destruction_queue_signaux(s_etat_processus);
BUG(1, uprintf("Process management error line %d\n", __LINE__));
exit(EXIT_FAILURE);
}

pthread_mutex_trylock(&((*s_etat_processus).protection_liste_mutexes));

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

caractere = 0;

while((longueur_ecriture = write_atomic(s_etat_processus,
(*s_argument_thread).pipe_nombre_elements_attente[1],
&caractere, sizeof(caractere))) != sizeof(caractere))
{
if (longueur_ecriture == -1)
{
break;
}
}

destruction_queue_signaux(s_etat_processus);
BUG(1, uprintf("Process management error line %d\n", __LINE__));
exit(EXIT_FAILURE);
}

pthread_mutex_trylock(&((*s_etat_processus).mutex_interruptions));

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

caractere = 0;

while((longueur_ecriture = write_atomic(s_etat_processus,
(*s_argument_thread).pipe_nombre_elements_attente[1],
&caractere, sizeof(caractere))) != sizeof(caractere))
{
if (longueur_ecriture == -1)
{
break;
}
}

destruction_queue_signaux(s_etat_processus);
BUG(1, uprintf("Process management error line %d\n", __LINE__));
exit(EXIT_FAILURE);
}

pthread_mutex_trylock(&((*s_etat_processus).mutex_signaux));

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

caractere = 0;

while((longueur_ecriture = write_atomic(s_etat_processus,
(*s_argument_thread).pipe_nombre_elements_attente[1],
&caractere, sizeof(caractere))) != sizeof(caractere))
{
if (longueur_ecriture == -1)
{
break;
}
}

destruction_queue_signaux(s_etat_processus);
BUG(1, uprintf("Process management error line %d\n", __LINE__));
exit(EXIT_FAILURE);
}

if ((*s_etat_processus).evaluation_expression_compilee == 'N')	if ((*s_etat_processus).evaluation_expression_compilee == 'N')
{	{
free((*s_etat_processus).instruction_courante);	free((*s_etat_processus).instruction_courante);
Line 1913 instruction_detach(struct_processus *s_e	Line 1822 instruction_detach(struct_processus *s_e
{	{
l_element_suivant = (*l_element_courant).suivant;	l_element_suivant = (*l_element_courant).suivant;

	// On ne détruit pas le descripteur sous prétexte
	// d'avoir le fichier ou la socket fermée dans le processus père

	/*
fclose((((struct_descripteur_fichier )	fclose((((struct_descripteur_fichier )
(*l_element_courant).donnee)).descripteur_c);	(*l_element_courant).donnee)).descripteur_c);

Line 1922 instruction_detach(struct_processus *s_e	Line 1835 instruction_detach(struct_processus *s_e
sqlite3_close((((struct_descripteur_fichier )	sqlite3_close((((struct_descripteur_fichier )
(*l_element_courant).donnee)).descripteur_sqlite);	(*l_element_courant).donnee)).descripteur_sqlite);
}	}
	*/

free((((struct_descripteur_fichier ) (*l_element_courant)	free((((struct_descripteur_fichier ) (*l_element_courant)
.donnee)).nom);	.donnee)).nom);
Line 2343 instruction_detach(struct_processus *s_e	Line 2257 instruction_detach(struct_processus *s_e
{	{
if ((*s_etat_processus).var_volatile_alarme != 0)	if ((*s_etat_processus).var_volatile_alarme != 0)
{	{
envoi_signal_thread(((((struct_processus_fils *)	envoi_signal_thread(s_etat_processus,
	((((struct_processus_fils *)
((l_element_courant).donnee).objet)).thread)	((l_element_courant).donnee).objet)).thread)
.tid, rpl_sigurg);	.tid, rpl_sigurg);
}	}
Line 2351 instruction_detach(struct_processus *s_e	Line 2266 instruction_detach(struct_processus *s_e
{	{
if ((*s_etat_processus).arret_depuis_abort == -1)	if ((*s_etat_processus).arret_depuis_abort == -1)
{	{
envoi_signal_thread(((((struct_processus_fils *)	envoi_signal_thread(s_etat_processus,
	((((struct_processus_fils *)
((l_element_courant).donnee).objet))	((l_element_courant).donnee).objet))
.thread).tid, rpl_sigabort);	.thread).tid, rpl_sigabort);
}	}
else	else
{	{
envoi_signal_thread(((((struct_processus_fils *)	envoi_signal_thread(s_etat_processus,
	((((struct_processus_fils *)
((l_element_courant).donnee).objet))	((l_element_courant).donnee).objet))
.thread).tid, rpl_sigstop);	.thread).tid, rpl_sigstop);
}	}
Line 2403 instruction_detach(struct_processus *s_e	Line 2320 instruction_detach(struct_processus *s_e
((((struct_processus_fils ) ((*l_element_courant)	((((struct_processus_fils ) ((*l_element_courant)
.donnee).objet)).thread).nombre_objets_dans_pipe--;	.donnee).objet)).thread).nombre_objets_dans_pipe--;

	if (pthread_mutex_lock(&mutex_sigaction) != 0)
	{
	destruction_queue_signaux(s_etat_processus);
	(*s_etat_processus).erreur_systeme = d_es_processus;
	exit(EXIT_FAILURE);
	}

action.sa_handler = SIG_IGN;	action.sa_handler = SIG_IGN;
action.sa_flags = SA_ONSTACK;	action.sa_flags = 0;

if (sigaction(SIGPIPE, &action, &registre) != 0)	if (sigaction(SIGPIPE, &action, &registre) != 0)
{	{
pthread_mutex_unlock(&((*s_etat_processus)	pthread_mutex_unlock(&((*s_etat_processus)
.mutex_pile_processus));	.mutex_pile_processus));
	pthread_mutex_unlock(&mutex_sigaction);

if (registre_stop == 0)	if (registre_stop == 0)
{	{
Line 2463 instruction_detach(struct_processus *s_e	Line 2388 instruction_detach(struct_processus *s_e
{	{
destruction_queue_signaux(s_etat_processus);	destruction_queue_signaux(s_etat_processus);

	pthread_mutex_unlock(&mutex_sigaction);
pthread_mutex_unlock(&((*s_etat_processus)	pthread_mutex_unlock(&((*s_etat_processus)
.mutex_pile_processus));	.mutex_pile_processus));
(*s_etat_processus).erreur_systeme = d_es_signal;	(*s_etat_processus).erreur_systeme = d_es_signal;
exit(EXIT_FAILURE);	exit(EXIT_FAILURE);
}	}

	if (pthread_mutex_unlock(&mutex_sigaction) != 0)
	{
	destruction_queue_signaux(s_etat_processus);
	pthread_mutex_unlock(&((*s_etat_processus)
	.mutex_pile_processus));
	(*s_etat_processus).erreur_systeme = d_es_processus;
	exit(EXIT_FAILURE);
	}
}	}
}	}

Line 2513 instruction_detach(struct_processus *s_e	Line 2448 instruction_detach(struct_processus *s_e
{	{
l_element_suivant = (*l_element_courant).suivant;	l_element_suivant = (*l_element_courant).suivant;

if ((((struct_socket ) ((l_element_courant).donnee)
.objet)).socket_connectee == d_vrai)
{
shutdown((((struct_socket ) ((l_element_courant).donnee)
.objet)).socket, SHUT_RDWR);
}

close((((struct_socket ) ((l_element_courant).donnee)
.objet)).socket);

if (((((struct_socket ) ((l_element_courant).donnee).objet))	if (((((struct_socket ) ((l_element_courant).donnee).objet))
.pid == getpid()) && (pthread_equal((((struct_socket )	.pid == getpid()) && (pthread_equal((((struct_socket )
((l_element_courant).donnee).objet)).tid, pthread_self())	((l_element_courant).donnee).objet)).tid, pthread_self())
!= 0))	!= 0))
{	{
	if ((((struct_socket ) ((l_element_courant).donnee)
	.objet)).socket_connectee == d_vrai)
	{
	shutdown((((struct_socket ) ((l_element_courant).donnee)
	.objet)).socket, SHUT_RDWR);
	}

	close((((struct_socket ) ((l_element_courant).donnee)
	.objet)).socket);

if ((((struct_socket ) ((l_element_courant).donnee).objet))	if ((((struct_socket ) ((l_element_courant).donnee).objet))
.effacement == 'Y')	.effacement == 'Y')
{	{
Line 2824 instruction_detach(struct_processus *s_e	Line 2759 instruction_detach(struct_processus *s_e
attente.tv_sec = 0;	attente.tv_sec = 0;
attente.tv_nsec = GRANULARITE_us * 1000;	attente.tv_nsec = GRANULARITE_us * 1000;

while(nombre_thread_surveillance_processus != 0)	pthread_mutex_lock(&((*s_etat_processus).mutex_pile_processus));

	while(nombre_threads_surveillance_processus != 0)
{	{
	pthread_mutex_unlock(&((*s_etat_processus).mutex_pile_processus));
nanosleep(&attente, NULL);	nanosleep(&attente, NULL);
INCR_GRANULARITE(attente.tv_nsec);	INCR_GRANULARITE(attente.tv_nsec);
	pthread_mutex_lock(&((*s_etat_processus).mutex_pile_processus));
}	}

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

closelog();	closelog();

retrait_thread(s_etat_processus);	retrait_thread(s_etat_processus);
liberation_contexte_cas(s_etat_processus);	liberation_contexte_cas(s_etat_processus);
destruction_queue_signaux(s_etat_processus);

# ifndef SEMAPHORES_NOMMES
sem_post(&((*s_etat_processus).semaphore_fork));
sem_destroy(&((*s_etat_processus).semaphore_fork));
# else
sem_post((*s_etat_processus).semaphore_fork);
sem_destroy3((*s_etat_processus).semaphore_fork, getpid(),
pthread_self(), SEM_FORK);
# endif

clear_history();	clear_history();

Line 2862 instruction_detach(struct_processus *s_e	Line 2793 instruction_detach(struct_processus *s_e
liberation_allocateur(s_etat_processus);	liberation_allocateur(s_etat_processus);
liberation_allocateur_buffer(s_etat_processus);	liberation_allocateur_buffer(s_etat_processus);

	// Permet d'attendre la libération du mutex de la part
	// de surveillance_processus().

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

	while(pthread_mutex_trylock(&((*s_etat_processus).mutex_pile_processus))
	== EBUSY)
	{
	nanosleep(&attente, NULL);
	INCR_GRANULARITE(attente.tv_nsec);
	}

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

	// Libération des mutexes.

pthread_mutex_destroy(&((*s_etat_processus).mutex_pile_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_allocation));
pthread_mutex_destroy(&((*s_etat_processus).mutex_interruptions));	pthread_mutex_destroy(&((*s_etat_processus).mutex_interruptions));
Line 2870 instruction_detach(struct_processus *s_e	Line 2818 instruction_detach(struct_processus *s_e
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_sections_critiques);
pthread_mutex_destroy(&mutex_liste_variables_partagees);	pthread_mutex_destroy(&mutex_liste_variables_partagees);

	destruction_queue_signaux(s_etat_processus);
pthread_mutex_destroy(&mutex_liste_threads);	pthread_mutex_destroy(&mutex_liste_threads);
	pthread_mutex_destroy(&mutex_liste_threads_surveillance);

	# ifndef SEMAPHORES_NOMMES
	sem_post(&((*s_etat_processus).semaphore_fork));
	sem_destroy(&((*s_etat_processus).semaphore_fork));
	# else
	sem_post((*s_etat_processus).semaphore_fork);
	sem_destroy3((*s_etat_processus).semaphore_fork, getpid(),
	pthread_self(), SEM_FORK);
	# endif

sys_free(s_etat_processus);	sys_free(s_etat_processus);

Line 2879 instruction_detach(struct_processus *s_e	Line 2839 instruction_detach(struct_processus *s_e
analyse_post_mortem();	analyse_post_mortem();
# endif	# endif

	pthread_mutex_destroy(&mutex_sigaction);
exit(EXIT_SUCCESS);	exit(EXIT_SUCCESS);
}	}
else	else
{	{
	deverrouillage_threads_concurrents(s_etat_processus);
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
return;	return;
}	}
Line 2968 instruction_detach(struct_processus *s_e	Line 2930 instruction_detach(struct_processus *s_e
}	}

close(pipe_initialisation_segment_signaux[0]);	close(pipe_initialisation_segment_signaux[0]);
close(pipe_initialisation_segment_signaux[1]);

// 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.

Line 2987 instruction_detach(struct_processus *s_e	Line 2948 instruction_detach(struct_processus *s_e
}	}

return;	return;
#endif
}	}

// vim: ts=4	// vim: ts=4

CVSweb interface <joel.bertrand@systella.fr>

Removed from v.1.158
changed lines
	Added in v.1.178