rpl/src/instructions_w1.c - diff

Return to instructions_w1.c CVS log

Up to [local] / rpl / src

Diff for /rpl/src/instructions_w1.c between versions 1.80 and 1.95

version 1.80, 2013/03/21 14:39:10	version 1.95, 2015/02/19 11:01:28
Line 1	Line 1
/*	/*
================================================================================	================================================================================
RPL/2 (R) version 4.1.13	RPL/2 (R) version 4.1.21
Copyright (C) 1989-2013 Dr. BERTRAND Joël	Copyright (C) 1989-2015 Dr. BERTRAND Joël

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

Line 289 instruction_wait(struct_processus *s_eta	Line 289 instruction_wait(struct_processus *s_eta

scrutation_injection(s_etat_processus);	scrutation_injection(s_etat_processus);

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

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

	if (pthread_mutex_unlock(&(*s_etat_processus).mutex_interruptions)
	!= 0)
	{
	(*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);
Line 698 instruction_write(struct_processus *s_et	Line 712 instruction_write(struct_processus *s_et

free(chaine);	free(chaine);

if (alsprintf(&commande, "insert or replace into data "	if (alsprintf(s_etat_processus, &commande,
	"insert or replace into data "
"(id, data) values (%lld, '%s')", (((integer8 )	"(id, data) values (%lld, '%s')", (((integer8 )
(*s_objet_argument_2).objet)), chaine_utf8) < 0)	(*s_objet_argument_2).objet)), chaine_utf8) < 0)
{	{
Line 748 instruction_write(struct_processus *s_et	Line 763 instruction_write(struct_processus *s_et

// Récupération de la position de la clef	// Récupération de la position de la clef

if (alsprintf(&commande, "select key from control "	if (alsprintf(s_etat_processus, &commande,
"where id = 1") < 0)	"select key from control where id = 1") < 0)
{	{
(*s_etat_processus).erreur_systeme =	(*s_etat_processus).erreur_systeme =
d_es_allocation_memoire;	d_es_allocation_memoire;
Line 925 instruction_write(struct_processus *s_et	Line 940 instruction_write(struct_processus *s_et

// Récupération de l'identifiant de la clef	// Récupération de l'identifiant de la clef

if (alsprintf(&commande, "select id from key where key = "	if (alsprintf(s_etat_processus, &commande,
"'%s'", clef_utf8) < 0)	"select id from key where key = '%s'", clef_utf8) < 0)
{	{
(*s_etat_processus).erreur_systeme =	(*s_etat_processus).erreur_systeme =
d_es_allocation_memoire;	d_es_allocation_memoire;
Line 971 instruction_write(struct_processus *s_et	Line 986 instruction_write(struct_processus *s_et

free(commande);	free(commande);

if (alsprintf(&commande, "insert into key "	if (alsprintf(s_etat_processus, &commande,
"(key) values ('%s')", clef_utf8) < 0)	"insert into key (key) values ('%s')",
	clef_utf8) < 0)
{	{
(*s_etat_processus).erreur_systeme =	(*s_etat_processus).erreur_systeme =
d_es_allocation_memoire;	d_es_allocation_memoire;
Line 1005 instruction_write(struct_processus *s_et	Line 1021 instruction_write(struct_processus *s_et

free(commande);	free(commande);

if (alsprintf(&commande, "select id from key "	if (alsprintf(s_etat_processus, &commande,
"where key = '%s'", clef_utf8) < 0)	"select id from key where key = '%s'",
	clef_utf8) < 0)
{	{
(*s_etat_processus).erreur_systeme =	(*s_etat_processus).erreur_systeme =
d_es_allocation_memoire;	d_es_allocation_memoire;
Line 1069 instruction_write(struct_processus *s_et	Line 1086 instruction_write(struct_processus *s_et

if (mise_a_jour == d_vrai)	if (mise_a_jour == d_vrai)
{	{
if (alsprintf(&commande, "update key set key = '%s' where "	if (alsprintf(s_etat_processus, &commande,
"id = %lld", clef_utf8, id) < 0)	"update key set key = '%s' where id = %lld",
	clef_utf8, id) < 0)
{	{
(*s_etat_processus).erreur_systeme =	(*s_etat_processus).erreur_systeme =
d_es_allocation_memoire;	d_es_allocation_memoire;
Line 1105 instruction_write(struct_processus *s_et	Line 1123 instruction_write(struct_processus *s_et

// Effacement de l'enregistrement existant	// Effacement de l'enregistrement existant

if (alsprintf(&commande, "delete from data where "	if (alsprintf(s_etat_processus, &commande,
"key_id = %lld", id) < 0)	"delete from data where key_id = %lld", id) < 0)
{	{
(*s_etat_processus).erreur_systeme =	(*s_etat_processus).erreur_systeme =
d_es_allocation_memoire;	d_es_allocation_memoire;
Line 1240 instruction_write(struct_processus *s_et	Line 1258 instruction_write(struct_processus *s_et

free(chaine);	free(chaine);

if (alsprintf(&commande, "insert into data "	if (alsprintf(s_etat_processus, &commande,
"(data, key_id, sequence) values "	"insert into data (data, key_id, sequence) values "
"('%s', %lld, %lld)", chaine_utf8, id, ordre) < 0)	"('%s', %lld, %lld)", chaine_utf8, id, ordre) < 0)
{	{
(*s_etat_processus).erreur_systeme =	(*s_etat_processus).erreur_systeme =
Line 1480 instruction_write(struct_processus *s_et	Line 1498 instruction_write(struct_processus *s_et
return;	return;
}	}

if ((format_chaine = conversion_majuscule((unsigned char *)	if ((format_chaine = conversion_majuscule(s_etat_processus,
((l_element_courant_format).donnee).objet))	(unsigned char ) ((*l_element_courant_format)
== NULL)	.donnee).objet)) == NULL)
{	{
(*s_etat_processus).erreur_systeme =	(*s_etat_processus).erreur_systeme =
d_es_allocation_memoire;	d_es_allocation_memoire;
Line 1886 instruction_write(struct_processus *s_et	Line 1904 instruction_write(struct_processus *s_et

memset(&adresse_ipv4, 0, sizeof(adresse_ipv4));	memset(&adresse_ipv4, 0, sizeof(adresse_ipv4));
adresse_ipv4.sin_family = AF_INET;	adresse_ipv4.sin_family = AF_INET;
adresse_ipv4.sin_port = htons(port);	adresse_ipv4.sin_port = htons((uint16_t) port);
adresse_ipv4.sin_addr.s_addr = htonl(calcul_adresse);	adresse_ipv4.sin_addr.s_addr = htonl(calcul_adresse);

# ifndef SEMAPHORES_NOMMES	# ifndef SEMAPHORES_NOMMES
Line 2197 instruction_wflock(struct_processus *s_e	Line 2215 instruction_wflock(struct_processus *s_e

do	do
{	{
if ((chaine = conversion_majuscule((unsigned char *)	if ((chaine = conversion_majuscule(s_etat_processus,
(*s_objet_argument_1).objet)) == NULL)	(unsigned char ) (s_objet_argument_1).objet)) == NULL)
{	{
(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;	(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;
return;	return;
Line 2279 instruction_wflock(struct_processus *s_e	Line 2297 instruction_wflock(struct_processus *s_e
}	}
else	else
{	{
	if (pthread_mutex_lock(&(*s_etat_processus).mutex_interruptions)
	!= 0)
	{
	(*s_etat_processus).erreur_systeme = d_es_processus;
	return;
	}

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

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

	if ((*s_etat_processus).nombre_interruptions_en_queue != 0)
{	{
registre_instruction_valide =	registre_instruction_valide =
(*s_etat_processus).instruction_valide;	(*s_etat_processus).instruction_valide;
Line 2399 instruction_wfproc(struct_processus *s_e	Line 2430 instruction_wfproc(struct_processus *s_e
}	}
}	}

if (pthread_mutex_lock(&((*s_etat_processus).mutex)) != 0)	if (pthread_mutex_lock(&((*s_etat_processus).mutex_pile_processus))
	!= 0)
{	{
if ((*s_etat_processus).profilage == d_vrai)	if ((*s_etat_processus).profilage == d_vrai)
{	{
Line 2464 instruction_wfproc(struct_processus *s_e	Line 2496 instruction_wfproc(struct_processus *s_e
profilage(s_etat_processus, NULL);	profilage(s_etat_processus, NULL);
}	}

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;
Line 2544 instruction_wfproc(struct_processus *s_e	Line 2577 instruction_wfproc(struct_processus *s_e
* Le processus n'est pas terminé	* Le processus n'est pas terminé
*/	*/

if (pthread_mutex_unlock(&((*s_etat_processus).mutex)) != 0)	if (pthread_mutex_lock(&((*s_etat_processus)
	.mutex_interruptions)) != 0)
{	{
	pthread_mutex_unlock(&((*s_etat_processus)
	.mutex_pile_processus));

if ((*s_etat_processus).profilage == d_vrai)	if ((*s_etat_processus).profilage == d_vrai)
{	{
profilage(s_etat_processus, NULL);	profilage(s_etat_processus, NULL);
Line 2562 instruction_wfproc(struct_processus *s_e	Line 2599 instruction_wfproc(struct_processus *s_e
affectation_interruptions_logicielles(s_etat_processus);	affectation_interruptions_logicielles(s_etat_processus);
}	}

if ((*s_etat_processus).nombre_interruptions_en_queue	if (pthread_mutex_unlock(&((*s_etat_processus)
!= 0)	.mutex_interruptions)) != 0)
	{
	pthread_mutex_unlock(&((*s_etat_processus)
	.mutex_pile_processus));

	if ((*s_etat_processus).profilage == d_vrai)
	{
	profilage(s_etat_processus, NULL);
	}

	(*s_etat_processus).erreur_systeme =
	d_es_processus;
	return;
	}

	if (pthread_mutex_unlock(&((*s_etat_processus)
	.mutex_pile_processus)) != 0)
	{
	if ((*s_etat_processus).profilage == d_vrai)
	{
	profilage(s_etat_processus, NULL);
	}

	(*s_etat_processus).erreur_systeme =
	d_es_processus;
	return;
	}

	if ((*s_etat_processus).nombre_interruptions_en_queue != 0)
{	{
registre_instruction_valide =	registre_instruction_valide =
(*s_etat_processus).instruction_valide;	(*s_etat_processus).instruction_valide;
Line 2602 instruction_wfproc(struct_processus *s_e	Line 2667 instruction_wfproc(struct_processus *s_e

scrutation_injection(s_etat_processus);	scrutation_injection(s_etat_processus);

if (pthread_mutex_lock(&((*s_etat_processus).mutex)) != 0)	if (pthread_mutex_lock(&((*s_etat_processus)
	.mutex_pile_processus)) != 0)
{	{
if ((*s_etat_processus).profilage == d_vrai)	if ((*s_etat_processus).profilage == d_vrai)
{	{
Line 2624 instruction_wfproc(struct_processus *s_e	Line 2690 instruction_wfproc(struct_processus *s_e
profilage(s_etat_processus, NULL);	profilage(s_etat_processus, NULL);
}	}

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;
Line 2727 instruction_wfdata(struct_processus *s_e	Line 2794 instruction_wfdata(struct_processus *s_e
}	}
}	}

if (pthread_mutex_lock(&((*s_etat_processus).mutex)) != 0)	if (pthread_mutex_lock(&((*s_etat_processus).mutex_pile_processus))
	!= 0)
{	{
if ((*s_etat_processus).profilage == d_vrai)	if ((*s_etat_processus).profilage == d_vrai)
{	{
Line 2787 instruction_wfdata(struct_processus *s_e	Line 2855 instruction_wfdata(struct_processus *s_e
profilage(s_etat_processus, NULL);	profilage(s_etat_processus, NULL);
}	}

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;
Line 2830 instruction_wfdata(struct_processus *s_e	Line 2899 instruction_wfdata(struct_processus *s_e
return;	return;
}	}

if (pthread_mutex_unlock(&((*s_etat_processus).mutex)) != 0)	if (pthread_mutex_unlock(&((*s_etat_processus)
	.mutex_pile_processus)) != 0)
{	{
if ((*s_etat_processus).profilage == d_vrai)	if ((*s_etat_processus).profilage == d_vrai)
{	{
Line 2871 instruction_wfdata(struct_processus *s_e	Line 2941 instruction_wfdata(struct_processus *s_e

scrutation_injection(s_etat_processus);	scrutation_injection(s_etat_processus);

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

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)
	{
	(*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)
{	{
registre_instruction_valide =	registre_instruction_valide =
Line 2896 instruction_wfdata(struct_processus *s_e	Line 2980 instruction_wfdata(struct_processus *s_e
return;	return;
}	}

if (pthread_mutex_lock(&((*s_etat_processus).mutex)) != 0)	if (pthread_mutex_lock(&((*s_etat_processus)
	.mutex_pile_processus)) != 0)
{	{
if ((*s_etat_processus).profilage == d_vrai)	if ((*s_etat_processus).profilage == d_vrai)
{	{
Line 2923 instruction_wfdata(struct_processus *s_e	Line 3008 instruction_wfdata(struct_processus *s_e
profilage(s_etat_processus, NULL);	profilage(s_etat_processus, NULL);
}	}

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;
Line 3607 instruction_wfswi(struct_processus *s_et	Line 3693 instruction_wfswi(struct_processus *s_et
return;	return;
}	}

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

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

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

if ((*s_etat_processus).queue_interruptions[interruption - 1] > 0)	if ((*s_etat_processus).queue_interruptions[interruption - 1] > 0)
{	{
drapeau_fin = d_vrai;	drapeau_fin = d_vrai;
Line 3744 instruction_wfpoke(struct_processus *s_e	Line 3844 instruction_wfpoke(struct_processus *s_e

scrutation_injection(s_etat_processus);	scrutation_injection(s_etat_processus);

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

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

	if (pthread_mutex_unlock(&(*s_etat_processus).mutex_interruptions) != 0)
	{
	(*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)
{	{
registre_instruction_valide =	registre_instruction_valide =
Line 3851 instruction_wfack(struct_processus *s_et	Line 3963 instruction_wfack(struct_processus *s_et
{	{
scrutation_injection(s_etat_processus);	scrutation_injection(s_etat_processus);

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

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

	if (pthread_mutex_unlock(&(*s_etat_processus).mutex_interruptions) != 0)
	{
	(*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)
{	{
registre_instruction_valide =	registre_instruction_valide =

CVSweb interface <joel.bertrand@systella.fr>

Removed from v.1.80
changed lines
	Added in v.1.95