X-Git-Url: https://git.llucax.com/z.facultad/75.06/emufs.git/blobdiff_plain/5b66d417c3e3e118874abb1861c8237e275bb614..5c39a8b8061f2ae5c22a12e40d1b9f4ffea42c68:/emufs/fsc.c?ds=sidebyside

diff --git a/emufs/fsc.c b/emufs/fsc.c
index ffcad79..4c5008a 100644
--- a/emufs/fsc.c
+++ b/emufs/fsc.c
@@ -84,8 +84,7 @@ int emufs_fsc_agregar_gap(EMUFS *emu, EMUFS_OFFSET marker, EMUFS_FREE freespace)
 	EMUFS_FSC gap_aux,gap_before,gap_after,gap_new;
 	char name_f_fsc[255];
 	EMUFS_REG_ID pos_gap_before = 0, pos_gap_after = 0;
-	unsigned long source,destination,limit,file_size,reg_count = 0,cant_moved = 0;
-	char found = 0;
+	unsigned long source,destination,file_size,reg_count = 0,cant_moved = 0;
 		
 	strcpy(name_f_fsc,emu->nombre);
 	strcat(name_f_fsc, EMUFS_FSC_EXT);
@@ -117,42 +116,11 @@ int emufs_fsc_agregar_gap(EMUFS *emu, EMUFS_OFFSET marker, EMUFS_FREE freespace)
 	
 	/* Si no encontre gaps ni por delante ni por detras */
 	if ((gap_before.marker == -1) && (gap_after.marker == -1)) {
-		/* Lo guardo ordenado donde deba ir */
+		/* Lo guardo en el archivo al final */
 		gap_new.marker = marker;
 		gap_new.freespace = freespace;
-		/* Busco el gap que sucede a este */
-		fseek(f_fsc,0,SEEK_SET);
-		while (!feof(f_fsc)) {
-			fread(&gap_aux,sizeof(EMUFS_FSC),1,f_fsc);
-			if (gap_aux.marker > gap_new.marker) {
-				found = 1;
-				break;
-			}
-		}
-		if (found == 1) {
-			/* Movemos todos los gaps desde el sucesor hasta el final, una pos adelante */
-			limit = ftell(f_fsc) - sizeof(EMUFS_FSC);
-			fseek(f_fsc,0,SEEK_END);
-			reg_count = (ftell(f_fsc) - limit) / sizeof(EMUFS_FSC);			
-			source = ftell(f_fsc) - sizeof(EMUFS_FSC);
-
-			while (cant_moved < reg_count)
-			{
-				fseek(f_fsc,source,SEEK_SET);
-				fread(&gap_aux,sizeof(EMUFS_FSC),1,f_fsc);
-				fwrite(&gap_aux,sizeof(EMUFS_FSC),1,f_fsc);
-				source -= sizeof(EMUFS_FSC);
-				++cant_moved;
-			}
-			/* Agrego el nuevo registro */
-			fseek(f_fsc,limit,SEEK_SET);
-			fwrite(&gap_new,sizeof(EMUFS_FSC),1,f_fsc);
-		}
-		else {
-			fseek(f_fsc,0,SEEK_END);
-			fwrite(&gap_new,sizeof(EMUFS_FSC),1,f_fsc);
-		}
-		
+		fseek(f_fsc,0,SEEK_END);
+		fwrite(&gap_new,sizeof(EMUFS_FSC),1,f_fsc);
 		fclose(f_fsc);		
 	}
 	
@@ -406,31 +374,20 @@ int emufs_fsc_get_max_min_fs(EMUFS *emu, EMUFS_FREE *min, EMUFS_FREE *max)
 	strcpy(name_f_fsc,emu->nombre);
 	strcat(name_f_fsc, EMUFS_FSC_EXT);
 
+	*min = ULONG_MAX;
+	*max = 0;
 	if ( (f_fsc = fopen(name_f_fsc,"r"))==NULL ) return -1;
-		
-	/* Si el file esta vacio, devuelvo valores nulos */
-	fseek(f_fsc,0,SEEK_END);
-	if (ftell(f_fsc) == 0) {
-		*min = 0;
-		*max = 0;
-		return 0;		
-	}
-	else
-	{
-		/* Busco Min y Max */
-		*min = ULONG_MAX;
-		*max = 0;		
-		fseek(f_fsc,0,SEEK_SET);		
-		while ( !feof(f_fsc) ){
-			if ( fread(&reg, sizeof(EMUFS_FSC), 1, f_fsc) != 1) continue;
-			if (  reg.freespace < *min )
-				*min = reg.freespace;
-			if ( reg.freespace > *max )
-				*max = reg.freespace;
-		}
-		fclose(f_fsc);
-		return 0;		
+	
+	while ( !feof(f_fsc) ){
+		fread(&reg, sizeof(EMUFS_FSC), 1, f_fsc);
+		if (  reg.freespace < *min )
+			*min = reg.freespace;
+		if ( reg.freespace > *max )
+			*max = reg.freespace;
 	}
+
+	fclose(f_fsc);
+	return 0;
 }
 
 EMUFS_FREE emufs_fsc_get_media_fs(EMUFS *emu)
@@ -447,13 +404,41 @@ EMUFS_FREE emufs_fsc_get_media_fs(EMUFS *emu)
 	if ( (f_fsc = fopen(name_f_fsc,"r"))==NULL ) return -1;
 	
 	while ( !feof(f_fsc) ){
-		if ( fread(&reg, sizeof(EMUFS_FSC), 1, f_fsc) != 1) continue;		
+		fread(&reg, sizeof(EMUFS_FSC), 1, f_fsc);
 		total_fs += reg.freespace;
 		++gap_count;
 	}
 
 	fclose(f_fsc);
+	return total_fs/gap_count;
+}
+
+int emufs_fsc_get_cant_bloques_vacios(EMUFS *emu)
+{
+	FILE *f_fsc;
+	EMUFS_FSC reg;
+	char name_f_fsc[255];
+	int cant=0;
 	
-	if (gap_count > 0) return total_fs/gap_count;
-	else return 0;
+	strcpy(name_f_fsc,emu->nombre);
+	strcat(name_f_fsc, EMUFS_FSC_EXT);
+
+	if ( (f_fsc = fopen(name_f_fsc,"r"))==NULL ) return -1;
+	while ( !feof(f_fsc) ){
+		fread(&reg, sizeof(EMUFS_FSC), 1, f_fsc);
+		if ( reg.freespace == emu->tam_bloque )
+			cant++;
+	}
+		
+	fclose(f_fsc);
+	return cant;
+}
+
+int emufs_fsc_truncate(EMUFS* efs, EMUFS_BLOCK_ID blocks)
+{
+	char name_f_fsc[255];
+
+	strcpy(name_f_fsc, efs->nombre);
+	strcat(name_f_fsc, EMUFS_FSC_EXT);
+	return truncate(name_f_fsc, blocks * sizeof(EMUFS_FSC));
 }