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.175 and 1.176

version 1.175, 2016/03/24 09:38:29	version 1.176, 2016/03/29 12:27:35
Line 2480 scrutation_interruptions(struct_processu	Line 2480 scrutation_interruptions(struct_processu
if (msync(s_queue_signaux, sizeof(s_queue_signaux),	if (msync(s_queue_signaux, sizeof(s_queue_signaux),
MS_ASYNC \| MS_INVALIDATE) != 0)	MS_ASYNC \| MS_INVALIDATE) != 0)
{	{
	sem_post(semaphore_queue_signaux);
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
return;	return;
}	}
Line 2818 envoi_signal_processus(pid_t pid, enum s	Line 2819 envoi_signal_processus(pid_t pid, enum s
{	{
munmap(queue, sizeof(struct_queue_signaux));	munmap(queue, sizeof(struct_queue_signaux));
close(segment);	close(segment);
	sem_close(semaphore);
return(1);	return(1);
}	}

if (munmap(queue, sizeof(struct_queue_signaux)) != 0)	if (munmap(queue, sizeof(struct_queue_signaux)) != 0)
{	{
close(segment);	close(segment);
	sem_close(semaphore);
return(1);	return(1);
}	}

Line 2832 envoi_signal_processus(pid_t pid, enum s	Line 2835 envoi_signal_processus(pid_t pid, enum s
# ifndef OS2 // SysV	# ifndef OS2 // SysV
if (shmdt(queue) != 0)	if (shmdt(queue) != 0)
{	{
	sem_close(semaphore);
return(1);	return(1);
}	}
# else // OS/2	# else // OS/2
Line 2852 envoi_signal_processus(pid_t pid, enum s	Line 2856 envoi_signal_processus(pid_t pid, enum s
!= 0)	!= 0)
{	{
munmap(queue, sizeof(struct_queue_signaux));	munmap(queue, sizeof(struct_queue_signaux));
	sem_close(semaphore);
	sem_close(signalisation);
close(segment);	close(segment);
return(1);	return(1);
}	}

if (munmap(queue, sizeof(struct_queue_signaux)) != 0)	if (munmap(queue, sizeof(struct_queue_signaux)) != 0)
{	{
	sem_close(semaphore);
	sem_close(signalisation);
close(segment);	close(segment);
return(1);	return(1);
}	}
Line 2867 envoi_signal_processus(pid_t pid, enum s	Line 2875 envoi_signal_processus(pid_t pid, enum s
# ifndef OS2 // SysV	# ifndef OS2 // SysV
if (shmdt(queue) != 0)	if (shmdt(queue) != 0)
{	{
	sem_close(semaphore);
	sem_close(signalisation);
return(1);	return(1);
}	}
# else // OS/2	# else // OS/2
Line 2893 envoi_signal_processus(pid_t pid, enum s	Line 2903 envoi_signal_processus(pid_t pid, enum s
{	{
munmap(queue, sizeof(struct_queue_signaux));	munmap(queue, sizeof(struct_queue_signaux));
close(segment);	close(segment);
	sem_close(semaphore);
	sem_close(signalisation);
return(1);	return(1);
}	}

if (munmap(queue, sizeof(struct_queue_signaux)) != 0)	if (munmap(queue, sizeof(struct_queue_signaux)) != 0)
{	{
close(segment);	close(segment);
	sem_close(semaphore);
	sem_close(signalisation);
return(1);	return(1);
}	}

Line 2907 envoi_signal_processus(pid_t pid, enum s	Line 2921 envoi_signal_processus(pid_t pid, enum s
# ifndef OS2 // SysV	# ifndef OS2 // SysV
if (shmdt(queue) != 0)	if (shmdt(queue) != 0)
{	{
	sem_close(semaphore);
	sem_close(signalisation);
return(1);	return(1);
}	}
# else // OS/2	# else // OS/2
Line 2926 envoi_signal_processus(pid_t pid, enum s	Line 2942 envoi_signal_processus(pid_t pid, enum s
{	{
munmap(queue, sizeof(struct_queue_signaux));	munmap(queue, sizeof(struct_queue_signaux));
close(segment);	close(segment);
	sem_close(signalisation);
return(1);	return(1);
}	}

if (munmap(queue, sizeof(struct_queue_signaux)) != 0)	if (munmap(queue, sizeof(struct_queue_signaux)) != 0)
{	{
close(segment);	close(segment);
	sem_close(signalisation);
return(1);	return(1);
}	}

Line 2940 envoi_signal_processus(pid_t pid, enum s	Line 2958 envoi_signal_processus(pid_t pid, enum s
# ifndef OS2 // SysV	# ifndef OS2 // SysV
if (shmdt(queue) != 0)	if (shmdt(queue) != 0)
{	{
	sem_close(signalisation);
return(1);	return(1);
}	}
# else // OS/2	# else // OS/2
Line 2958 envoi_signal_processus(pid_t pid, enum s	Line 2977 envoi_signal_processus(pid_t pid, enum s
{	{
munmap(queue, sizeof(struct_queue_signaux));	munmap(queue, sizeof(struct_queue_signaux));
close(segment);	close(segment);
	sem_close(signalisation);
return(1);	return(1);
}	}

if (munmap(queue, sizeof(struct_queue_signaux)) != 0)	if (munmap(queue, sizeof(struct_queue_signaux)) != 0)
{	{
close(segment);	close(segment);
	sem_close(signalisation);
return(1);	return(1);
}	}

Line 2972 envoi_signal_processus(pid_t pid, enum s	Line 2993 envoi_signal_processus(pid_t pid, enum s
# ifndef OS2 // SysV	# ifndef OS2 // SysV
if (shmdt(queue) != 0)	if (shmdt(queue) != 0)
{	{
	sem_close(signalisation);
return(1);	return(1);
}	}
# else // OS/2	# else // OS/2
Line 3448 creation_queue_signaux(struct_processus	Line 3470 creation_queue_signaux(struct_processus
void	void
liberation_queue_signaux(struct_processus *s_etat_processus)	liberation_queue_signaux(struct_processus *s_etat_processus)
{	{
sem_wait(semaphore_arret_signalisation);
(*s_queue_signaux).requete_arret = d_vrai;

# ifndef IPCS_SYSV
msync(s_queue_signaux, sizeof(s_queue_signaux), MS_ASYNC \| MS_INVALIDATE);
# endif

sem_post(semaphore_arret_signalisation);

// Incr�menter le s�maphore pour �tre s�r de le d�bloquer.

sem_post(semaphore_signalisation);

if (getpid() == (*s_queue_signaux).controle)
{
arret_thread_signaux(s_etat_processus);
pthread_join((*s_queue_signaux).thread_signaux, NULL);
}

# ifdef IPCS_SYSV // SystemV	# ifdef IPCS_SYSV // SystemV
# ifndef OS2	# ifndef OS2
if (shmdt(s_queue_signaux) == -1)	if (shmdt(s_queue_signaux) == -1)
Line 3526 destruction_queue_signaux(struct_process	Line 3529 destruction_queue_signaux(struct_process
// Incr�menter le s�maphore pour �tre s�r de le d�bloquer.	// Incr�menter le s�maphore pour �tre s�r de le d�bloquer.

sem_post(semaphore_signalisation);	sem_post(semaphore_signalisation);
arret_thread_signaux(s_etat_processus);
pthread_join((*s_queue_signaux).thread_signaux, NULL);	pthread_join((*s_queue_signaux).thread_signaux, NULL);
	arret_thread_signaux(s_etat_processus);

# ifdef IPCS_SYSV // SystemV	# ifdef IPCS_SYSV // SystemV
# ifndef OS2	# ifndef OS2

CVSweb interface <joel.bertrand@systella.fr>

Removed from v.1.175
changed lines
	Added in v.1.176