- scheduler: build fixes for FreeBSD. From RustyBSD.

This commit is contained in:
David Anderson 2012-11-30 23:39:43 -08:00 committed by Oliver Bock
parent e2ab21944d
commit 2a120631a4
3 changed files with 16 additions and 3 deletions

View File

@ -7214,3 +7214,10 @@ David 30 Nov 2012
sched/
sched_customize.cpp
David 30 Nov 2012
- scheduler: build fixes for FreeBSD. From RustyBSD.
vda/
sched_vda.cpp
vda_lib2.cpp

View File

@ -27,6 +27,7 @@
#include <map>
#include <string>
#include <unistd.h>
#include <sys/wait.h>
#include "filesys.h"

View File

@ -21,6 +21,7 @@
#include <set>
#include <sys/stat.h>
#include <sys/types.h>
#include <sys/wait.h>
#include <vector>
#include <unistd.h>
@ -252,6 +253,7 @@ int META_CHUNK::encode(bool first) {
int META_CHUNK::decode() {
char cmd[1024], enc_filename[1024];
int retval;
// the Jerasure decoder infinite-loops if all chunks are present.
// So if this is the case, temporarily rename the first chunk
@ -271,7 +273,8 @@ int META_CHUNK::decode() {
sprintf(cmd, "mv %s/Coding/%s %s/Coding/decode_temp",
dir, enc_filename, dir
);
system(cmd);
retval = system(cmd);
if (retval) return retval;
}
}
@ -290,7 +293,8 @@ int META_CHUNK::decode() {
sprintf(cmd, "mv %s/Coding/decode_temp %s/Coding/%s",
dir, dir, enc_filename
);
system(cmd);
retval = system(cmd);
if (retval) return retval;
}
// decoder puts its result in Coding/data_decoded.vda
@ -305,7 +309,8 @@ int META_CHUNK::decode() {
}
filepath[n] = 0;
sprintf(cmd, "mv %s/Coding/data_decoded.vda %s", dir, filepath);
system(cmd);
retval = system(cmd);
if (retval) return retval;
return 0;
}