aboutsummaryrefslogtreecommitdiffstats
path: root/P1/src
diff options
context:
space:
mode:
authorMatt Strapp <strap012@umn.edu>2020-10-03 16:50:25 -0500
committerMatt Strapp <strap012@umn.edu>2020-10-03 16:50:25 -0500
commit75fa6acd03235624dbdcd5bdf48a79bc7933f05b (patch)
treec3ad7479f6aadd934b0a91f36271eb303c4f08c6 /P1/src
parentEdit permissions (diff)
parentUpdate (diff)
downloadcsci4061-75fa6acd03235624dbdcd5bdf48a79bc7933f05b.tar
csci4061-75fa6acd03235624dbdcd5bdf48a79bc7933f05b.tar.gz
csci4061-75fa6acd03235624dbdcd5bdf48a79bc7933f05b.tar.bz2
csci4061-75fa6acd03235624dbdcd5bdf48a79bc7933f05b.tar.lz
csci4061-75fa6acd03235624dbdcd5bdf48a79bc7933f05b.tar.xz
csci4061-75fa6acd03235624dbdcd5bdf48a79bc7933f05b.tar.zst
csci4061-75fa6acd03235624dbdcd5bdf48a79bc7933f05b.zip
Merge branch 'master' of github.umn.edu:STRAP012/csci4061Projects
Diffstat (limited to 'P1/src')
-rw-r--r--P1/src/mapper.c1
-rw-r--r--P1/src/mapreduce.c3
2 files changed, 3 insertions, 1 deletions
diff --git a/P1/src/mapper.c b/P1/src/mapper.c
index 1c4468b..f1299b7 100644
--- a/P1/src/mapper.c
+++ b/P1/src/mapper.c
@@ -100,6 +100,7 @@ int main(int argc, char *argv[]) {
printf("./mapper mapperID\n");
exit(0);
}
+
// ###### DO NOT REMOVE ######
mapperID = strtol(argv[1], NULL, 10);
diff --git a/P1/src/mapreduce.c b/P1/src/mapreduce.c
index 2f6a0fb..6a882bc 100644
--- a/P1/src/mapreduce.c
+++ b/P1/src/mapreduce.c
@@ -31,7 +31,7 @@ int main(int argc, char *argv[]) {
mapperPid = fork();
if (mapperPid > 0) {
//TODO: exec here
-
+ execl("./mapper", "./mapper", i, NULL);
}
}
@@ -58,6 +58,7 @@ int main(int argc, char *argv[]) {
reducerPid = fork();
if (reducerPid > 0) {
//TODO: exec here
+ execl("./reducer", "./reducer", i, NULL);
}
}