aboutsummaryrefslogtreecommitdiffstats
path: root/P2
diff options
context:
space:
mode:
authorAndrea Smith <smit9523@umn.edu>2020-11-04 10:55:09 -0600
committerAndrea Smith <smit9523@umn.edu>2020-11-04 10:55:09 -0600
commit2b5a7458377dc84329d26c2fa82a547304872ab1 (patch)
tree684b700aa9bccc900b5a43ef4db5fac19996d7ae /P2
parentAdded error handling (diff)
parentget rid of comment (diff)
downloadcsci4061-2b5a7458377dc84329d26c2fa82a547304872ab1.tar
csci4061-2b5a7458377dc84329d26c2fa82a547304872ab1.tar.gz
csci4061-2b5a7458377dc84329d26c2fa82a547304872ab1.tar.bz2
csci4061-2b5a7458377dc84329d26c2fa82a547304872ab1.tar.lz
csci4061-2b5a7458377dc84329d26c2fa82a547304872ab1.tar.xz
csci4061-2b5a7458377dc84329d26c2fa82a547304872ab1.tar.zst
csci4061-2b5a7458377dc84329d26c2fa82a547304872ab1.zip
Merge branch 'master' of github.umn.edu:STRAP012/csci4061Projects
Diffstat (limited to 'P2')
-rw-r--r--P2/lib/utils.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/P2/lib/utils.c b/P2/lib/utils.c
index 21753a1..7bdf941 100644
--- a/P2/lib/utils.c
+++ b/P2/lib/utils.c
@@ -24,7 +24,7 @@ char *getChunkData(int mapperID) {
msgrcv(mid, &message, MSGSIZE, mapperID, 0);
if (strncmp("END", message.msgText, 3) == 0)
return NULL;
- char* value = malloc(1024); // chunkSize or MSGSIZE?
+ char* value = malloc(1024);
strcpy(value, message.msgText);
return value;
}
@@ -85,9 +85,7 @@ int getInterData(char *Qkey, int reducerID) {
}
void shuffle(int nMappers, int nReducers) {
- //TODO: Error checking!!!!!!!!!!!!!
struct msgBuffer message = makeMessage();
- //Once again, MAKE SURE THIS WORKS PROPERLY!
int id = openQueue();
for (int i = 1; i <= nMappers; i++) {
char newpath[100];