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.26 and 1.37

version 1.26, 2010/06/08 10:22:37	version 1.37, 2010/08/17 11:59:27
Line 1	Line 1
/*	/*
================================================================================	================================================================================
RPL/2 (R) version 4.0.16	RPL/2 (R) version 4.0.18
Copyright (C) 1989-2010 Dr. BERTRAND Joël	Copyright (C) 1989-2010 Dr. BERTRAND Joël

This file is part of RPL/2.	This file is part of RPL/2.
Line 20	Line 20
*/	*/


#include "rpl.conv.h"	#include "rpl-conv.h"


/*	/*
Line 1159 instruction_detach(struct_processus *s_e	Line 1159 instruction_detach(struct_processus *s_e

verrouillage_threads_concurrents(s_etat_processus);	verrouillage_threads_concurrents(s_etat_processus);
(*s_argument_thread).pid = fork();	(*s_argument_thread).pid = fork();

	# ifdef OS2
	if ((*s_argument_thread).pid == 0)
	{
	sem_init(&semaphore_liste_threads, 0, 1);
	sem_init(&semaphore_gestionnaires_signaux, 0, 0);
	sem_init(&semaphore_gestionnaires_signaux_atomique, 0, 1);
	sem_init(&((*s_etat_processus).semaphore_fork), 0, 0);
	}
	# endif

deverrouillage_threads_concurrents(s_etat_processus);	deverrouillage_threads_concurrents(s_etat_processus);

pthread_sigmask(SIG_SETMASK, &oldset2, NULL);	pthread_sigmask(SIG_SETMASK, &oldset2, NULL);
Line 1200 instruction_detach(struct_processus *s_e	Line 1211 instruction_detach(struct_processus *s_e
((((struct_processus_fils ) (s_objet).objet)).thread)	((((struct_processus_fils ) (s_objet).objet)).thread)
.nombre_references = 1;	.nombre_references = 1;

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

/*	/*
* On copie l'objet plutôt que le pointeur car cet objet peut être	* On copie l'objet plutôt que le pointeur car cet objet peut être
* accédé depuis deux threads distincts et aboutir à un blocage lors	* accédé depuis deux threads distincts et aboutir à un blocage lors
Line 1281 instruction_detach(struct_processus *s_e	Line 1286 instruction_detach(struct_processus *s_e
return;	return;
}	}

	# ifndef OS2
if (pthread_attr_setschedpolicy(&attributs, SCHED_OTHER) != 0)	if (pthread_attr_setschedpolicy(&attributs, SCHED_OTHER) != 0)
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
Line 1299 instruction_detach(struct_processus *s_e	Line 1305 instruction_detach(struct_processus *s_e
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
return;	return;
}	}
	# endif

(*s_argument_thread).s_etat_processus = s_etat_processus;	(*s_argument_thread).s_etat_processus = s_etat_processus;

Line 1321 instruction_detach(struct_processus *s_e	Line 1328 instruction_detach(struct_processus *s_e
* Processus fils	* Processus fils
*/	*/

	# ifdef _BROKEN_SIGINFO
	liberation_fifos_signaux(s_etat_processus);
	creation_fifos_signaux(s_etat_processus);
	# endif

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 1510 instruction_detach(struct_processus *s_e	Line 1522 instruction_detach(struct_processus *s_e
}	}
}	}

	# ifdef _BROKEN_SIGINFO
	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 1540 instruction_detach(struct_processus *s_e	Line 1556 instruction_detach(struct_processus *s_e
}	}
}	}

	# ifdef _BROKEN_SIGINFO
	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);
}	}

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

if (pthread_mutex_unlock(&((*s_etat_processus)	if (pthread_mutex_unlock(&((*s_etat_processus)
.protection_liste_mutexes)) != 0)	.protection_liste_mutexes)) != 0)
{	{
Line 1571 instruction_detach(struct_processus *s_e	Line 1593 instruction_detach(struct_processus *s_e
}	}
}	}

	# ifdef _BROKEN_SIGINFO
	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 1593 instruction_detach(struct_processus *s_e	Line 1619 instruction_detach(struct_processus *s_e

liberation(s_etat_processus, (*s_etat_processus).at_exit);	liberation(s_etat_processus, (*s_etat_processus).at_exit);
(*s_etat_processus).at_exit = NULL;	(*s_etat_processus).at_exit = NULL;
	liberation(s_etat_processus, (*s_etat_processus).at_poke);
	(*s_etat_processus).at_poke = NULL;
	(*s_etat_processus).traitement_at_poke = 'N';

for(i = 0; i < d_NOMBRE_INTERRUPTIONS; i++)	for(i = 0; i < d_NOMBRE_INTERRUPTIONS; i++)
{	{
Line 1716 instruction_detach(struct_processus *s_e	Line 1745 instruction_detach(struct_processus *s_e
}	}
}	}

	# ifdef _BROKEN_SIGINFO
	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 1732 instruction_detach(struct_processus *s_e	Line 1765 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_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 1758 instruction_detach(struct_processus *s_e	Line 1794 instruction_detach(struct_processus *s_e
}	}

free(s_argument_thread2);	free(s_argument_thread2);
	free(((l_element_courant).donnee).objet);
	free((*l_element_courant).donnee);
}	}

l_element_suivant = (*l_element_courant).suivant;	l_element_suivant = (*l_element_courant).suivant;
Line 1793 instruction_detach(struct_processus *s_e	Line 1831 instruction_detach(struct_processus *s_e
}	}
}	}

	# ifdef _BROKEN_SIGINFO
	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 1857 instruction_detach(struct_processus *s_e	Line 1899 instruction_detach(struct_processus *s_e
}	}
}	}

	# ifdef _BROKEN_SIGINFO
	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 1909 instruction_detach(struct_processus *s_e	Line 1955 instruction_detach(struct_processus *s_e
}	}
}	}

	# ifdef _BROKEN_SIGINFO
	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 2093 instruction_detach(struct_processus *s_e	Line 2143 instruction_detach(struct_processus *s_e
}	}

liberation(s_etat_processus, (*s_etat_processus).at_exit);	liberation(s_etat_processus, (*s_etat_processus).at_exit);
	liberation(s_etat_processus, (*s_etat_processus).at_poke);

l_element_courant = (*s_etat_processus).liste_mutexes;	l_element_courant = (*s_etat_processus).liste_mutexes;
while(l_element_courant != NULL)	while(l_element_courant != NULL)
Line 2456 instruction_detach(struct_processus *s_e	Line 2507 instruction_detach(struct_processus *s_e
registre_stop;	registre_stop;
}	}

	# ifdef _BROKEN_SIGINFO
	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 2490 instruction_detach(struct_processus *s_e	Line 2545 instruction_detach(struct_processus *s_e

if (sigaction(SIGPIPE, &registre, NULL) != 0)	if (sigaction(SIGPIPE, &registre, NULL) != 0)
{	{
	# ifdef _BROKEN_SIGINFO
	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;
Line 2511 instruction_detach(struct_processus *s_e	Line 2570 instruction_detach(struct_processus *s_e

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

	# ifdef _BROKEN_SIGINFO
	destruction_fifos_signaux(s_etat_processus);
	# endif

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

while(l_element_courant != NULL)	while(l_element_courant != NULL)
Line 2806 instruction_detach(struct_processus *s_e	Line 2869 instruction_detach(struct_processus *s_e

liberation(s_etat_processus, s_objet);	liberation(s_etat_processus, s_objet);

# ifndef Cygwin	# if !defined(Cygwin) && !defined(OpenBSD)
(*s_etat_processus).pile_signal.ss_flags = SS_DISABLE;	(*s_etat_processus).pile_signal.ss_flags = SS_DISABLE;
sigaltstack(&((*s_etat_processus).pile_signal), NULL);	sigaltstack(&((*s_etat_processus).pile_signal), NULL);
free((*s_etat_processus).pile_signal.ss_sp);	free((*s_etat_processus).pile_signal.ss_sp);
Line 2851 instruction_detach(struct_processus *s_e	Line 2914 instruction_detach(struct_processus *s_e
retrait_thread(s_etat_processus);	retrait_thread(s_etat_processus);

pthread_mutex_destroy(&((*s_etat_processus).mutex));	pthread_mutex_destroy(&((*s_etat_processus).mutex));
	pthread_mutex_destroy(&((*s_etat_processus).mutex_allocation));
pthread_mutex_destroy(&((*s_etat_processus).protection_liste_mutexes));	pthread_mutex_destroy(&((*s_etat_processus).protection_liste_mutexes));

pthread_key_delete(semaphore_fork_processus_courant);	pthread_key_delete(semaphore_fork_processus_courant);
Line 2895 instruction_detach(struct_processus *s_e	Line 2959 instruction_detach(struct_processus *s_e
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
return;	return;
}

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

// Si le pid existe déjà dans la pile des processus, il s'agit forcement	// Si le pid existe déjà dans la pile des processus, il s'agit forcement

CVSweb interface <joel.bertrand@systella.fr>

Removed from v.1.26
changed lines
	Added in v.1.37