#else
#include "posix-compat.h"
#endif
-#include "arc4.h"
+#include "../lib/arc4.h"
-#define CHUNK_SIZE (63 * 1024) /* Max file size. */
+/* This is the max file size for an older version of the Pintos
+ file system that had 126 direct blocks each pointing to a
+ single disk sector. We could raise it now. */
+#define CHUNK_SIZE (126 * 512)
#define CHUNK_CNT 8 /* Number of chunks. */
#define DATA_SIZE (CHUNK_CNT * CHUNK_SIZE) /* Buffer size. */
struct arc4 arc4;
size_t i;
- printf ("page-merge-par) init\n");
+ printf ("(page-merge-par) init\n");
arc4_init (&arc4, "foobar", 6);
arc4_crypt (&arc4, buf1, sizeof buf1);
printf ("(page-merge-par) sort chunk %zu\n", i);
/* Write this chunk to a file. */
- snprintf (fn, sizeof fn, "buf%d", i);
+ snprintf (fn, sizeof fn, "buf%zu", i);
create (fn, CHUNK_SIZE);
fd = open (fn);
if (fd < 0)
}
/* Read chunk back from file. */
- snprintf (fn, sizeof fn, "buf%d", i);
+ snprintf (fn, sizeof fn, "buf%zu", i);
fd = open (fn);
if (fd < 0)
{