rpl/src/instructions_s10.c - diff

Return to instructions_s10.c CVS log

Up to [local] / rpl / src

Diff for /rpl/src/instructions_s10.c between versions 1.73 and 1.97

version 1.73, 2013/04/01 15:29:37	version 1.97, 2017/08/03 15:13:32
Line 1	Line 1
/*	/*
================================================================================	================================================================================
RPL/2 (R) version 4.1.14	RPL/2 (R) version 4.1.27
Copyright (C) 1989-2013 Dr. BERTRAND Joël	Copyright (C) 1989-2017 Dr. BERTRAND Joël

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

Line 233 instruction_spawn(struct_processus *s_et	Line 233 instruction_spawn(struct_processus *s_et
return;	return;
}	}

if (pipe((*s_argument_thread).pipe_nombre_interruptions_attente) != 0)	if (pipe((*s_argument_thread).pipe_nombre_elements_attente) != 0)
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
return;	return;
Line 251 instruction_spawn(struct_processus *s_et	Line 251 instruction_spawn(struct_processus *s_et
return;	return;
}	}

if (pipe((*s_argument_thread).pipe_nombre_objets_attente) != 0)
{
(*s_etat_processus).erreur_systeme = d_es_processus;
return;
}

if (pipe((*s_argument_thread).pipe_injections) != 0)	if (pipe((*s_argument_thread).pipe_injections) != 0)
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
Line 293 instruction_spawn(struct_processus *s_et	Line 287 instruction_spawn(struct_processus *s_et

(*s_nouvel_etat_processus).pipe_donnees =	(*s_nouvel_etat_processus).pipe_donnees =
(*s_argument_thread).pipe_objets[1];	(*s_argument_thread).pipe_objets[1];
(*s_nouvel_etat_processus).pipe_nombre_objets_attente =	(*s_nouvel_etat_processus).pipe_nombre_elements_attente =
(*s_argument_thread).pipe_nombre_objets_attente[1];	(*s_argument_thread).pipe_nombre_elements_attente[1];
(*s_nouvel_etat_processus).pipe_interruptions =	(*s_nouvel_etat_processus).pipe_interruptions =
(*s_argument_thread).pipe_interruptions[1];	(*s_argument_thread).pipe_interruptions[1];
(*s_nouvel_etat_processus).pipe_nombre_interruptions_attente =
(*s_argument_thread).pipe_nombre_interruptions_attente[1];
(*s_nouvel_etat_processus).pipe_injections =	(*s_nouvel_etat_processus).pipe_injections =
(*s_argument_thread).pipe_injections[0];	(*s_argument_thread).pipe_injections[0];
(*s_nouvel_etat_processus).pipe_nombre_injections =	(*s_nouvel_etat_processus).pipe_nombre_injections =
Line 407 instruction_spawn(struct_processus *s_et	Line 399 instruction_spawn(struct_processus *s_et
attente.tv_sec = 0;	attente.tv_sec = 0;
attente.tv_nsec = GRANULARITE_us * 1000;	attente.tv_nsec = GRANULARITE_us * 1000;

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

while((*s_argument_thread).thread_actif == d_faux)	while((*s_argument_thread).thread_actif == d_faux)
{	{
scrutation_interruptions(s_etat_processus);	scrutation_interruptions(s_etat_processus);

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

nanosleep(&attente, NULL);	nanosleep(&attente, NULL);

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

INCR_GRANULARITE(attente.tv_nsec);	INCR_GRANULARITE(attente.tv_nsec);
}	}

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

if (pthread_attr_destroy(&attributs) != 0)	if (pthread_attr_destroy(&attributs) != 0)
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
Line 471 instruction_spawn(struct_processus *s_et	Line 489 instruction_spawn(struct_processus *s_et
return;	return;
}	}

if (pthread_mutex_lock(&((*s_etat_processus).mutex)) != 0)	if (pthread_mutex_lock(&((*s_etat_processus).mutex_pile_processus)) != 0)
{	{
pthread_mutex_unlock(&((*s_nouvel_etat_processus).mutex));
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
return;	return;
}	}
Line 502 instruction_spawn(struct_processus *s_et	Line 519 instruction_spawn(struct_processus *s_et
((l_element_courant).donnee).objet)).thread)	((l_element_courant).donnee).objet)).thread)
.tid, (*s_argument_thread).tid) != 0)	.tid, (*s_argument_thread).tid) != 0)
{	{
if (pthread_mutex_unlock(&((*s_etat_processus).mutex)) != 0)	scrutation_injection(s_etat_processus);

	if (pthread_mutex_lock(&((*s_etat_processus)
	.mutex_interruptions)) != 0)
{	{
	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;
return;	return;
}	}

scrutation_injection(s_etat_processus);

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

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

if ((*s_etat_processus).nombre_interruptions_en_queue != 0)	if ((*s_etat_processus).nombre_interruptions_en_queue != 0)
{	{
traitement_interruptions_logicielles(s_etat_processus);	traitement_interruptions_logicielles(s_etat_processus);
}	}

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

nanosleep(&attente, NULL);	nanosleep(&attente, NULL);
INCR_GRANULARITE(attente.tv_nsec);	INCR_GRANULARITE(attente.tv_nsec);

if (pthread_mutex_lock(&((*s_etat_processus).mutex)) != 0)	if (pthread_mutex_lock(&((*s_etat_processus)
	.mutex_pile_processus)) != 0)
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
return;	return;
Line 544 instruction_spawn(struct_processus *s_et	Line 581 instruction_spawn(struct_processus *s_et
(struct_liste_chainee *) &((s_etat_processus)	(struct_liste_chainee *) &((s_etat_processus)
.l_base_pile_processus), s_objet_systeme) == d_erreur)	.l_base_pile_processus), s_objet_systeme) == d_erreur)
{	{
pthread_mutex_unlock(&((*s_etat_processus).mutex));	pthread_mutex_unlock(&((*s_etat_processus).mutex_pile_processus));
return;	return;
}	}

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

CVSweb interface <joel.bertrand@systella.fr>

Removed from v.1.73
changed lines
	Added in v.1.97