chap3

bac2/os/chap3/group.c

@@ -6,18 +6,19 @@
 
 #define printlist(s, x) printf("%s = [", #x); for (int i = 0; i < s; ++i) { printf("%d, ", x[i]); } printf("\b\b]\n");
 
-#define listSize 10000000
+#define listSize 1000000
 int list[listSize];
 
 int main(void)
 {
+	// liste de nombre aléatoires
 	srand(time(NULL));
 	for (int i = 0; i < listSize; ++i) {
-		list[i] = rand();
+		list[i] = rand()%listSize;
 	}
 	/* printlist(listSize, list); */
 
-	margs_t args = {list, 0, 9};
+	mrg_t args = merge_init(list, listSize);
 	merge_sort(&args);
 	printlist(listSize, list);
 }