projects
/
pintos-anon
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use 0xcc (not 0xcd) for clearing malloc() blocks too.
[pintos-anon]
/
grading
/
vm
/
page-merge-seq.c
diff --git
a/grading/vm/page-merge-seq.c
b/grading/vm/page-merge-seq.c
index b451306d4f64be6631f303ad35d61208b2e6ea8a..203ca9cd25ac42b6ad34da57c3983eaf3c851365 100644
(file)
--- a/
grading/vm/page-merge-seq.c
+++ b/
grading/vm/page-merge-seq.c
@@
-5,9
+5,12
@@
#else
#include "posix-compat.h"
#endif
#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 16 /* Number of chunks. */
#define DATA_SIZE (CHUNK_CNT * CHUNK_SIZE) /* Buffer size. */
#define CHUNK_CNT 16 /* Number of chunks. */
#define DATA_SIZE (CHUNK_CNT * CHUNK_SIZE) /* Buffer size. */
@@
-55,7
+58,7
@@
sort (void)
close (fd);
/* Sort with subprocess. */
close (fd);
/* Sort with subprocess. */
- pid_t child = exec ("child-sort");
+ pid_t child = exec ("child-sort
buffer
");
if (child == -1)
{
printf ("(page-merge-seq) exec() failed\n");
if (child == -1)
{
printf ("(page-merge-seq) exec() failed\n");