rpl/src/gestion_threads.c - diff

Return to gestion_threads.c CVS log

Up to [local] / rpl / src

Diff for /rpl/src/gestion_threads.c between versions 1.14 and 1.48

version 1.14, 2010/04/28 11:05:45	version 1.48, 2011/09/01 12:14:56
Line 1	Line 1
/*	/*
================================================================================	================================================================================
RPL/2 (R) version 4.0.15	RPL/2 (R) version 4.1.3
Copyright (C) 1989-2010 Dr. BERTRAND Joël	Copyright (C) 1989-2011 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 74 lancement_thread(void *argument)	Line 74 lancement_thread(void *argument)
attente.tv_nsec = GRANULARITE_us * 1000;	attente.tv_nsec = GRANULARITE_us * 1000;

s_argument_thread = (struct_descripteur_thread *) argument;	s_argument_thread = (struct_descripteur_thread *) argument;
	s_etat_processus = (*s_argument_thread).s_nouvel_etat_processus;
(*s_argument_thread).tid = pthread_self();	(*s_argument_thread).tid = pthread_self();
(*s_argument_thread).thread_actif = d_vrai;	(*s_argument_thread).thread_actif = d_vrai;
s_etat_processus = (*s_argument_thread).s_nouvel_etat_processus;

# ifndef SEMAPHORES_NOMMES	# ifndef SEMAPHORES_NOMMES
if (pthread_setspecific(semaphore_fork_processus_courant,	if (pthread_setspecific(semaphore_fork_processus_courant,
Line 268 lancement_thread(void *argument)	Line 268 lancement_thread(void *argument)
&& ((*s_etat_processus).at_exit != NULL))	&& ((*s_etat_processus).at_exit != NULL))
{	{
(*s_etat_processus).var_volatile_requete_arret = 0;	(*s_etat_processus).var_volatile_requete_arret = 0;
	(*s_etat_processus).var_volatile_traitement_retarde_stop = -1;

if (evaluation(s_etat_processus, (*s_etat_processus).at_exit,	if (evaluation(s_etat_processus, (*s_etat_processus).at_exit,
'E') == d_erreur)	'E') == d_erreur)
Line 642 lancement_thread(void *argument)	Line 643 lancement_thread(void *argument)
l_element_courant = (struct_liste_chainee *)	l_element_courant = (struct_liste_chainee *)
(*s_etat_processus).l_base_pile_processus;	(*s_etat_processus).l_base_pile_processus;

if ((*s_etat_processus).nombre_interruptions_non_affectees != 0)
{
affectation_interruptions_logicielles(s_etat_processus);
}

registre_stop = (*s_etat_processus)	registre_stop = (*s_etat_processus)
.var_volatile_traitement_retarde_stop;	.var_volatile_traitement_retarde_stop;
(*s_etat_processus).var_volatile_traitement_retarde_stop = 1;	(*s_etat_processus).var_volatile_traitement_retarde_stop = 1;
Line 739 lancement_thread(void *argument)	Line 735 lancement_thread(void *argument)
}	}

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

	if ((*s_etat_processus).nombre_interruptions_non_affectees != 0)
	{
	affectation_interruptions_logicielles(s_etat_processus);
	}

nanosleep(&attente, NULL);	nanosleep(&attente, NULL);
pthread_mutex_lock(&((*s_etat_processus).mutex));	pthread_mutex_lock(&((*s_etat_processus).mutex));
}	}
Line 880 lancement_thread(void *argument)	Line 882 lancement_thread(void *argument)
(*s_etat_processus).instruction_derniere_erreur = NULL;	(*s_etat_processus).instruction_derniere_erreur = NULL;
}	}

for(i = 0; i < (*s_etat_processus).nombre_variables; i++)	liberation_arbre_variables(s_etat_processus,
{	(*s_etat_processus).s_arbre_variables, d_faux);
// Les définitions ne sont pas libérées parce qu'elles sont partagées
// avec le thread père.

if ((*s_etat_processus).s_liste_variables[i].niveau != 0)
{
liberation(s_etat_processus,
(*s_etat_processus).s_liste_variables[i].objet);
}

free((*s_etat_processus).s_liste_variables[i].nom);
}

free((*s_etat_processus).s_liste_variables);

for(i = 0; i < (*s_etat_processus).nombre_variables_statiques; i++)	for(i = 0; i < (*s_etat_processus).nombre_variables_statiques; i++)
{	{
Line 1029 lancement_thread(void *argument)	Line 1018 lancement_thread(void *argument)

liberation(s_etat_processus, (*s_argument_thread).argument);	liberation(s_etat_processus, (*s_argument_thread).argument);
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);

for(i = 0; i < d_NOMBRE_INTERRUPTIONS; i++)	for(i = 0; i < d_NOMBRE_INTERRUPTIONS; i++)
{	{
Line 1076 lancement_thread(void *argument)	Line 1066 lancement_thread(void *argument)

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

	sem_destroy(&((*s_etat_processus).semaphore_fork));

	liberation_contexte_cas(s_etat_processus);
free((*s_etat_processus).localisation);	free((*s_etat_processus).localisation);
free(s_etat_processus);	free(s_etat_processus);

Line 1085 lancement_thread(void *argument)	Line 1079 lancement_thread(void *argument)

(*s_argument_thread).thread_actif = d_faux;	(*s_argument_thread).thread_actif = d_faux;
pthread_exit(NULL);	pthread_exit(NULL);
	return(NULL);
}	}

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

CVSweb interface <joel.bertrand@systella.fr>

Removed from v.1.14
changed lines
	Added in v.1.48