rpl/src/interruptions.c - diff

Return to interruptions.c CVS log

Up to [local] / rpl / src

Diff for /rpl/src/interruptions.c between versions 1.78 and 1.79

version 1.78, 2011/09/20 09:51:43	version 1.79, 2011/09/20 14:36:29
Line 324 verrouillage_threads_concurrents(struct_	Line 324 verrouillage_threads_concurrents(struct_
== getpid()) && (pthread_equal((((struct_thread )	== getpid()) && (pthread_equal((((struct_thread )
(*l_element_courant).donnee)).tid, pthread_self()) == 0))	(*l_element_courant).donnee)).tid, pthread_self()) == 0))
{	{
while(sem_wait(&(((((struct_thread ) (l_element_courant)	# ifndef SEMAPHORES_NOMMES
.donnee)).s_etat_processus).semaphore_fork)) == -1)	while(sem_wait(&(((((struct_thread ) (l_element_courant)
	.donnee)).s_etat_processus).semaphore_fork)) == -1)
	# else
	while(sem_wait(((((struct_thread ) (l_element_courant)
	.donnee)).s_etat_processus).semaphore_fork) == -1)
	# endif
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
return;	return;
Line 351 deverrouillage_threads_concurrents(struc	Line 356 deverrouillage_threads_concurrents(struc
== getpid()) && (pthread_equal((((struct_thread )	== getpid()) && (pthread_equal((((struct_thread )
(*l_element_courant).donnee)).tid, pthread_self()) == 0))	(*l_element_courant).donnee)).tid, pthread_self()) == 0))
{	{
if (sem_post(&(((((struct_thread *)	# ifndef SEMAPHORES_NOMMES
(*l_element_courant).donnee)).s_etat_processus)	if (sem_post(&(((((struct_thread *)
.semaphore_fork)) != 0)	(*l_element_courant).donnee)).s_etat_processus)
	.semaphore_fork)) != 0)
	# else
	if (sem_post(((((struct_thread *)
	(*l_element_courant).donnee)).s_etat_processus)
	.semaphore_fork) != 0)
	# endif
{	{
if (pthread_mutex_unlock(&mutex_liste_threads) != 0)	if (pthread_mutex_unlock(&mutex_liste_threads) != 0)
{	{
Line 1109 liberation_threads(struct_processus *s_e	Line 1120 liberation_threads(struct_processus *s_e

liberation_allocateur(s_etat_processus);	liberation_allocateur(s_etat_processus);

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

liberation_contexte_cas(s_etat_processus);	liberation_contexte_cas(s_etat_processus);
free(s_etat_processus);	free(s_etat_processus);
Line 1298 verrouillage_gestionnaire_signaux(struct	Line 1314 verrouillage_gestionnaire_signaux(struct
{	{
int semaphore;	int semaphore;

	# ifndef SEMAPHORES_NOMMES
if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)	if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
	# else
	if (sem_post((*s_etat_processus).semaphore_fork) != 0)
	# endif
{	{
BUG(1, uprintf("Lock error !\n"));	BUG(1, uprintf("Lock error !\n"));
return;	return;
Line 1308 verrouillage_gestionnaire_signaux(struct	Line 1328 verrouillage_gestionnaire_signaux(struct

if (pthread_mutex_lock(&mutex_gestionnaires_signaux_atomique) != 0)	if (pthread_mutex_lock(&mutex_gestionnaires_signaux_atomique) != 0)
{	{
	# ifndef SEMAPHORES_NOMMES
sem_wait(&((*s_etat_processus).semaphore_fork));	sem_wait(&((*s_etat_processus).semaphore_fork));
	# else
	sem_wait((*s_etat_processus).semaphore_fork);
	# endif
BUG(1, uprintf("Unlock error !\n"));	BUG(1, uprintf("Unlock error !\n"));
return;	return;
}	}
Line 1319 verrouillage_gestionnaire_signaux(struct	Line 1343 verrouillage_gestionnaire_signaux(struct
if (sem_post(semaphore_gestionnaires_signaux) == -1)	if (sem_post(semaphore_gestionnaires_signaux) == -1)
# endif	# endif
{	{
	# ifndef SEMAPHORES_NOMMES
sem_wait(&((*s_etat_processus).semaphore_fork));	sem_wait(&((*s_etat_processus).semaphore_fork));
	# else
	sem_wait((*s_etat_processus).semaphore_fork);
	# endif
BUG(1, uprintf("Lock error !\n"));	BUG(1, uprintf("Lock error !\n"));
return;	return;
}	}
Line 1330 verrouillage_gestionnaire_signaux(struct	Line 1358 verrouillage_gestionnaire_signaux(struct
if (sem_getvalue(semaphore_gestionnaires_signaux, &semaphore) != 0)	if (sem_getvalue(semaphore_gestionnaires_signaux, &semaphore) != 0)
# endif	# endif
{	{
	# ifndef SEMAPHORES_NOMMES
sem_wait(&((*s_etat_processus).semaphore_fork));	sem_wait(&((*s_etat_processus).semaphore_fork));
	# else
	sem_wait((*s_etat_processus).semaphore_fork);
	# endif
BUG(1, uprintf("Lock error !\n"));	BUG(1, uprintf("Lock error !\n"));
return;	return;
}	}

if (pthread_mutex_unlock(&mutex_gestionnaires_signaux_atomique) != 0)	if (pthread_mutex_unlock(&mutex_gestionnaires_signaux_atomique) != 0)
{	{
	# ifndef SEMAPHORES_NOMMES
sem_wait(&((*s_etat_processus).semaphore_fork));	sem_wait(&((*s_etat_processus).semaphore_fork));
	# else
	sem_wait((*s_etat_processus).semaphore_fork);
	# endif
BUG(1, uprintf("Unlock error !\n"));	BUG(1, uprintf("Unlock error !\n"));
return;	return;
}	}
Line 1370 deverrouillage_gestionnaire_signaux(stru	Line 1406 deverrouillage_gestionnaire_signaux(stru

if (pthread_mutex_lock(&mutex_gestionnaires_signaux_atomique) == -1)	if (pthread_mutex_lock(&mutex_gestionnaires_signaux_atomique) == -1)
{	{
	# ifndef SEMAPHORES_NOMMES
sem_wait(&((*s_etat_processus).semaphore_fork));	sem_wait(&((*s_etat_processus).semaphore_fork));
	# else
	sem_wait((*s_etat_processus).semaphore_fork);
	# endif
BUG(1, uprintf("Unlock error !\n"));	BUG(1, uprintf("Unlock error !\n"));
return;	return;
}	}
Line 1381 deverrouillage_gestionnaire_signaux(stru	Line 1421 deverrouillage_gestionnaire_signaux(stru
if (sem_getvalue(semaphore_gestionnaires_signaux, &semaphore) != 0)	if (sem_getvalue(semaphore_gestionnaires_signaux, &semaphore) != 0)
# endif	# endif
{	{
	# ifndef SEMAPHORES_NOMMES
sem_wait(&((*s_etat_processus).semaphore_fork));	sem_wait(&((*s_etat_processus).semaphore_fork));
	# else
	sem_wait((*s_etat_processus).semaphore_fork);
	# endif
BUG(1, uprintf("Unlock error !\n"));	BUG(1, uprintf("Unlock error !\n"));
return;	return;
}	}
Line 1394 deverrouillage_gestionnaire_signaux(stru	Line 1438 deverrouillage_gestionnaire_signaux(stru
{	{
if (errno != EINTR)	if (errno != EINTR)
{	{
	# ifndef SEMAPHORES_NOMMES
sem_wait(&((*s_etat_processus).semaphore_fork));	sem_wait(&((*s_etat_processus).semaphore_fork));
	# else
	sem_wait((*s_etat_processus).semaphore_fork);
	# endif
BUG(1, uprintf("Unlock error !\n"));	BUG(1, uprintf("Unlock error !\n"));
return;	return;
}	}
Line 1402 deverrouillage_gestionnaire_signaux(stru	Line 1450 deverrouillage_gestionnaire_signaux(stru

if (pthread_mutex_unlock(&mutex_gestionnaires_signaux_atomique) != 0)	if (pthread_mutex_unlock(&mutex_gestionnaires_signaux_atomique) != 0)
{	{
	# ifndef SEMAPHORES_NOMMES
sem_wait(&((*s_etat_processus).semaphore_fork));	sem_wait(&((*s_etat_processus).semaphore_fork));
	# else
	sem_wait((*s_etat_processus).semaphore_fork);
	# endif
BUG(1, uprintf("Unlock error !\n"));	BUG(1, uprintf("Unlock error !\n"));
return;	return;
}	}

	# ifndef SEMAPHORES_NOMMES
while(sem_wait(&((*s_etat_processus).semaphore_fork)) != 0)	while(sem_wait(&((*s_etat_processus).semaphore_fork)) != 0)
	# else
	while(sem_wait((*s_etat_processus).semaphore_fork) != 0)
	# endif
{	{
BUG(1, uprintf("Unlock error !\n"));	if (errno != EINTR)
return;	{
	BUG(1, uprintf("Unlock error !\n"));
	return;
	}
}	}

if (semaphore == 1)	if (semaphore == 1)

CVSweb interface <joel.bertrand@systella.fr>

Removed from v.1.78
changed lines
	Added in v.1.79