rpl/src/allocateur.c - diff

Return to allocateur.c CVS log

Up to [local] / rpl / src

Diff for /rpl/src/allocateur.c between versions 1.4 and 1.6

version 1.4, 2015/01/27 15:41:25	version 1.6, 2015/02/01 09:47:18
Line 186 initialisation_allocateur_buffer(struct_	Line 186 initialisation_allocateur_buffer(struct_
{	{
longueur_tailles++;	longueur_tailles++;
}	}
	}

if (((*s_etat_processus).cache_buffer = sys_malloc(((size_t)	if (((*s_etat_processus).cache_buffer = sys_malloc(((size_t)
longueur_tailles) * sizeof(unsigned char **))) == NULL)	longueur_tailles) * sizeof(unsigned char **))) == NULL)
{	{
(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;	(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;
return;	return;
}	}

if (((*s_etat_processus).pointeur_cache_buffer = sys_malloc(((size_t)	if (((*s_etat_processus).pointeur_cache_buffer = sys_malloc(((size_t)
longueur_tailles) * sizeof(int))) == NULL)	longueur_tailles) * sizeof(int))) == NULL)
{	{
(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;	(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;
return;	return;
}
}	}

for(i = 0; i < longueur_tailles; i++)	for(i = 0; i < longueur_tailles; i++)
Line 238 liberation_allocateur_buffer(struct_proc	Line 238 liberation_allocateur_buffer(struct_proc
int i;	int i;
int j;	int j;

	uprintf("Libération de l'allocateur des buffers\n");
	BACKTRACE(10);
for(i = 0; i < longueur_tailles; i++)	for(i = 0; i < longueur_tailles; i++)
{	{
for(j = 0; j < (*s_etat_processus).pointeur_cache_buffer[i]; j++)	for(j = 0; j < (*s_etat_processus).pointeur_cache_buffer[i]; j++)
Line 256 liberation_allocateur_buffer(struct_proc	Line 258 liberation_allocateur_buffer(struct_proc
sys_free((*s_etat_processus).enveloppes_buffers[i]);	sys_free((*s_etat_processus).enveloppes_buffers[i]);
}	}

	uprintf("Fin de la libération de l'allocateur des buffers\n");
return;	return;
}	}

Line 405 rpl_malloc(struct_processus *s_etat_proc	Line 408 rpl_malloc(struct_processus *s_etat_proc

void *pointeur;	void *pointeur;

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

if ((s_buffer = allocation_buffer(s_etat_processus, s)) == NULL)	if ((s_buffer = allocation_buffer(s_etat_processus, s)) == NULL)
{	{
	pthread_mutex_unlock(&((*s_etat_processus).mutex_allocation_buffer));

(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;	(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;
return(NULL);	return(NULL);
}	}

pointeur = (s_buffer).buffer + sizeof(struct_buffer );	pointeur = (s_buffer).buffer + sizeof(struct_buffer );

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

return(pointeur);	return(pointeur);
}	}

Line 440 rpl_realloc(struct_processus *s_etat_pro	Line 459 rpl_realloc(struct_processus *s_etat_pro

void *pointeur;	void *pointeur;

	if (ptr == NULL)
	{
	return(rpl_malloc(s_etat_processus, s));
	}

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

if ((s_nouveau_buffer = allocation_buffer(s_etat_processus, s)) == NULL)	if ((s_nouveau_buffer = allocation_buffer(s_etat_processus, s)) == NULL)
{	{
	pthread_mutex_unlock(&((*s_etat_processus).mutex_allocation_buffer));

(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;	(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;
return(NULL);	return(NULL);
}	}
Line 458 rpl_realloc(struct_processus *s_etat_pro	Line 490 rpl_realloc(struct_processus *s_etat_pro
liberation_buffer(s_etat_processus, s_ancien_buffer);	liberation_buffer(s_etat_processus, s_ancien_buffer);
pointeur = (s_nouveau_buffer).buffer + sizeof(struct_buffer );	pointeur = (s_nouveau_buffer).buffer + sizeof(struct_buffer );

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

return(pointeur);	return(pointeur);
}	}

Line 485 rpl_free(struct_processus *s_etat_proces	Line 524 rpl_free(struct_processus *s_etat_proces
}	}

s_buffer = (((struct_buffer ) (ptr - sizeof(struct_buffer ))));	s_buffer = (((struct_buffer ) (ptr - sizeof(struct_buffer ))));

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

liberation_buffer(s_etat_processus, s_buffer);	liberation_buffer(s_etat_processus, s_buffer);

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

return;	return;
}	}

CVSweb interface <joel.bertrand@systella.fr>

Removed from v.1.4
changed lines
	Added in v.1.6