#endif
#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. */
/* Sort each chunk of buf1 using a subprocess. */
static void
-sort (void)
+sort_chunks (void)
{
pid_t children[CHUNK_CNT];
size_t i;
char fn[128];
int fd;
- if (join (children[i]) != 123)
+ if (wait (children[i]) != 123)
{
- printf ("(page-merge-par) join(exec()) returned bad value\n");
+ printf ("(page-merge-par) wait(exec()) returned bad value\n");
exit (1);
}
{
printf ("(page-merge-par) begin\n");
init ();
- sort ();
+ sort_chunks ();
merge ();
verify ();
printf ("(page-merge-par) end\n");