49a50
> #include <map>
105a107,127
> static int
> openFile(const string& filename, int flags, mode_t mode)
> {
> int sim_fd = open(filename.c_str(), flags, mode);
> if (sim_fd != -1)
> return sim_fd;
> fatal("Unable to open %s with mode %O", filename, mode);
> }
>
> static int
> openInputFile(const string &filename)
> {
> return openFile(filename, O_RDONLY, 0);
> }
>
> static int
> openOutputFile(const string &filename)
> {
> return openFile(filename, O_WRONLY | O_CREAT | O_TRUNC, 0664);
> }
>
119c141,149
< fd_map(new FdMap[NUM_FDS])
---
> fd_array(make_shared<array<FDEntry, NUM_FDS>>()),
> imap {{"", -1},
> {"cin", STDIN_FILENO},
> {"stdin", STDIN_FILENO}},
> oemap{{"", -1},
> {"cout", STDOUT_FILENO},
> {"stdout", STDOUT_FILENO},
> {"cerr", STDERR_FILENO},
> {"stderr", STDERR_FILENO}}
121,123c151,152
< string in = params->input;
< string out = params->output;
< string err = params->errout;
---
> int sim_fd;
> std::map<string,int>::iterator it;
125,131c154,158
< // initialize file descriptors to default: same as simulator
< int stdin_fd, stdout_fd, stderr_fd;
<
< if (in == "stdin" || in == "cin")
< stdin_fd = STDIN_FILENO;
< else if (in == "None")
< stdin_fd = -1;
---
> // Search through the input options and set fd if match is found;
> // otherwise, open an input file and seek to location.
> FDEntry *fde_stdin = get_fd_entry(STDIN_FILENO);
> if ((it = imap.find(params->input)) != imap.end())
> sim_fd = it->second;
133c160,161
< stdin_fd = Process::openInputFile(in);
---
> sim_fd = openInputFile(params->input);
> fde_stdin->set(sim_fd, params->input, O_RDONLY, -1, false);
135,140c163,167
< if (out == "stdout" || out == "cout")
< stdout_fd = STDOUT_FILENO;
< else if (out == "stderr" || out == "cerr")
< stdout_fd = STDERR_FILENO;
< else if (out == "None")
< stdout_fd = -1;
---
> // Search through the output/error options and set fd if match is found;
> // otherwise, open an output file and seek to location.
> FDEntry *fde_stdout = get_fd_entry(STDOUT_FILENO);
> if ((it = oemap.find(params->output)) != oemap.end())
> sim_fd = it->second;
142c169,171
< stdout_fd = Process::openOutputFile(out);
---
> sim_fd = openOutputFile(params->output);
> fde_stdout->set(sim_fd, params->output, O_WRONLY | O_CREAT | O_TRUNC,
> 0664, false);
144,151c173,178
< if (err == "stdout" || err == "cout")
< stderr_fd = STDOUT_FILENO;
< else if (err == "stderr" || err == "cerr")
< stderr_fd = STDERR_FILENO;
< else if (err == "None")
< stderr_fd = -1;
< else if (err == out)
< stderr_fd = stdout_fd;
---
> FDEntry *fde_stderr = get_fd_entry(STDERR_FILENO);
> if (params->output == params->errout)
> // Reuse the same file descriptor if these match.
> sim_fd = fde_stdout->fd;
> else if ((it = oemap.find(params->errout)) != oemap.end())
> sim_fd = it->second;
153c180,182
< stderr_fd = Process::openOutputFile(err);
---
> sim_fd = openOutputFile(params->errout);
> fde_stderr->set(sim_fd, params->errout, O_WRONLY | O_CREAT | O_TRUNC,
> 0664, false);
155,183d183
< // initialize first 3 fds (stdin, stdout, stderr)
< Process::FdMap *fdo = &fd_map[STDIN_FILENO];
< fdo->fd = stdin_fd;
< fdo->filename = in;
< fdo->flags = O_RDONLY;
< fdo->mode = -1;
< fdo->fileOffset = 0;
<
< fdo = &fd_map[STDOUT_FILENO];
< fdo->fd = stdout_fd;
< fdo->filename = out;
< fdo->flags = O_WRONLY | O_CREAT | O_TRUNC;
< fdo->mode = 0774;
< fdo->fileOffset = 0;
<
< fdo = &fd_map[STDERR_FILENO];
< fdo->fd = stderr_fd;
< fdo->filename = err;
< fdo->flags = O_WRONLY;
< fdo->mode = -1;
< fdo->fileOffset = 0;
<
<
< // mark remaining fds as free
< for (int i = 3; i < NUM_FDS; ++i) {
< fdo = &fd_map[i];
< fdo->fd = -1;
< }
<
201,206c201,202
< //
< // static helper functions
< //
<
< int
< Process::openInputFile(const string &filename)
---
> void
> Process::inheritFdArray(Process *p)
208,216c204
< int fd = open(filename.c_str(), O_RDONLY);
<
< if (fd == -1) {
< perror(NULL);
< cerr << "unable to open \"" << filename << "\" for reading\n";
< fatal("can't open input file");
< }
<
< return fd;
---
> fd_array = p->fd_array;
219,233d206
<
< int
< Process::openOutputFile(const string &filename)
< {
< int fd = open(filename.c_str(), O_WRONLY | O_CREAT | O_TRUNC, 0664);
<
< if (fd == -1) {
< perror(NULL);
< cerr << "unable to open \"" << filename << "\" for writing\n";
< fatal("can't open output file");
< }
<
< return fd;
< }
<
271d243
< // in case open() returns an error, don't allocate a new fd
275,285c247,250
< // find first free target fd
< for (int free_fd = 0; free_fd < NUM_FDS; ++free_fd) {
< Process::FdMap *fdo = &fd_map[free_fd];
< if (fdo->fd == -1 && fdo->driver == NULL) {
< fdo->fd = sim_fd;
< fdo->filename = filename;
< fdo->mode = mode;
< fdo->fileOffset = 0;
< fdo->flags = flags;
< fdo->isPipe = pipe;
< fdo->readPipeSource = 0;
---
> for (int free_fd = 0; free_fd < fd_array->size(); free_fd++) {
> FDEntry *fde = get_fd_entry(free_fd);
> if (fde->isFree()) {
> fde->set(sim_fd, filename, flags, mode, pipe);
290c255
< panic("Process::alloc_fd: out of file descriptors!");
---
> fatal("Out of target file descriptors");
294c259
< Process::free_fdmap_entry(int tgt_fd)
---
> Process::reset_fd_entry(int tgt_fd)
296,297c261,262
< Process::FdMap *fdo = &fd_map[tgt_fd];
< assert(fd_map[tgt_fd].fd > -1);
---
> FDEntry *fde = get_fd_entry(tgt_fd);
> assert(fde->fd > -1);
299,306c264
< fdo->fd = -1;
< fdo->filename = "NULL";
< fdo->mode = 0;
< fdo->fileOffset = 0;
< fdo->flags = 0;
< fdo->isPipe = false;
< fdo->readPipeSource = 0;
< fdo->driver = NULL;
---
> fde->reset();
312,313c270,271
< FdMap *obj = sim_fd_obj(tgt_fd);
< return obj ? obj->fd : -1;
---
> FDEntry *entry = get_fd_entry(tgt_fd);
> return entry ? entry->fd : -1;
316,317c274,275
< Process::FdMap *
< Process::sim_fd_obj(int tgt_fd)
---
> FDEntry *
> Process::get_fd_entry(int tgt_fd)
319,321c277,278
< if (tgt_fd < 0 || tgt_fd >= NUM_FDS)
< return NULL;
< return &fd_map[tgt_fd];
---
> assert(0 <= tgt_fd && tgt_fd < fd_array->size());
> return &(*fd_array)[tgt_fd];
327,328c284,285
< for (int index = 0; index < NUM_FDS; ++index)
< if (fd_map[index].fd == sim_fd)
---
> for (int index = 0; index < fd_array->size(); index++)
> if ((*fd_array)[index].fd == sim_fd)
366d322
< // find all offsets for currently open files and save them
370,375c326,330
< Process::FdMap *fdo_stdin = &fd_map[STDIN_FILENO];
< Process::FdMap *fdo_stdout = &fd_map[STDOUT_FILENO];
< Process::FdMap *fdo_stderr = &fd_map[STDERR_FILENO];
< string in = fdo_stdin->filename;
< string out = fdo_stdout->filename;
< string err = fdo_stderr->filename;
---
> auto seek = [] (FDEntry *fde)
> {
> if (lseek(fde->fd, fde->fileOffset, SEEK_SET) < 0)
> fatal("Unable to see to location in %s", fde->filename);
> };
377,378c332
< // initialize file descriptors to default: same as simulator
< int stdin_fd, stdout_fd, stderr_fd;
---
> std::map<string,int>::iterator it;
380,388c334,341
< if (in == "stdin" || in == "cin")
< stdin_fd = STDIN_FILENO;
< else if (in == "NULL")
< stdin_fd = -1;
< else {
< // open standard in and seek to the right location
< stdin_fd = Process::openInputFile(in);
< if (lseek(stdin_fd, fdo_stdin->fileOffset, SEEK_SET) < 0)
< panic("Unable to seek to correct location in file: %s", in);
---
> // Search through the input options and set fd if match is found;
> // otherwise, open an input file and seek to location.
> FDEntry *fde_stdin = get_fd_entry(STDIN_FILENO);
> if ((it = imap.find(fde_stdin->filename)) != imap.end()) {
> fde_stdin->fd = it->second;
> } else {
> fde_stdin->fd = openInputFile(fde_stdin->filename);
> seek(fde_stdin);
391,400c344,351
< if (out == "stdout" || out == "cout")
< stdout_fd = STDOUT_FILENO;
< else if (out == "stderr" || out == "cerr")
< stdout_fd = STDERR_FILENO;
< else if (out == "NULL")
< stdout_fd = -1;
< else {
< stdout_fd = Process::openOutputFile(out);
< if (lseek(stdout_fd, fdo_stdout->fileOffset, SEEK_SET) < 0)
< panic("Unable to seek to correct location in file: %s", out);
---
> // Search through the output/error options and set fd if match is found;
> // otherwise, open an output file and seek to location.
> FDEntry *fde_stdout = get_fd_entry(STDOUT_FILENO);
> if ((it = oemap.find(fde_stdout->filename)) != oemap.end()) {
> fde_stdout->fd = it->second;
> } else {
> fde_stdout->fd = openOutputFile(fde_stdout->filename);
> seek(fde_stdout);
403,414c354,362
< if (err == "stdout" || err == "cout")
< stderr_fd = STDOUT_FILENO;
< else if (err == "stderr" || err == "cerr")
< stderr_fd = STDERR_FILENO;
< else if (err == "NULL")
< stderr_fd = -1;
< else if (err == out)
< stderr_fd = stdout_fd;
< else {
< stderr_fd = Process::openOutputFile(err);
< if (lseek(stderr_fd, fdo_stderr->fileOffset, SEEK_SET) < 0)
< panic("Unable to seek to correct location in file: %s", err);
---
> FDEntry *fde_stderr = get_fd_entry(STDERR_FILENO);
> if (fde_stdout->filename == fde_stderr->filename) {
> // Reuse the same file descriptor if these match.
> fde_stderr->fd = fde_stdout->fd;
> } else if ((it = oemap.find(fde_stderr->filename)) != oemap.end()) {
> fde_stderr->fd = it->second;
> } else {
> fde_stderr->fd = openOutputFile(fde_stderr->filename);
> seek(fde_stderr);
417,419c365,368
< fdo_stdin->fd = stdin_fd;
< fdo_stdout->fd = stdout_fd;
< fdo_stderr->fd = stderr_fd;
---
> for (int tgt_fd = 3; tgt_fd < fd_array->size(); tgt_fd++) {
> FDEntry *fde = get_fd_entry(tgt_fd);
> if (fde->fd == -1)
> continue;
420a370,373
> if (fde->isPipe) {
> if (fde->filename == "PIPE-WRITE")
> continue;
> assert(fde->filename == "PIPE-READ");
422,432c375,377
< for (int free_fd = 3; free_fd < NUM_FDS; ++free_fd) {
< Process::FdMap *fdo = &fd_map[free_fd];
< if (fdo->fd != -1) {
< if (fdo->isPipe){
< if (fdo->filename == "PIPE-WRITE")
< continue;
< else {
< assert (fdo->filename == "PIPE-READ");
< //create a new pipe
< int fds[2];
< int pipe_retval = pipe(fds);
---
> int fds[2];
> if (pipe(fds) < 0)
> fatal("Unable to create new pipe");
434,441c379
< if (pipe_retval < 0) {
< // error
< panic("Unable to create new pipe.");
< }
< fdo->fd = fds[0]; //set read pipe
< Process::FdMap *fdo_write = &fd_map[fdo->readPipeSource];
< if (fdo_write->filename != "PIPE-WRITE")
< panic ("Couldn't find write end of the pipe");
---
> fde->fd = fds[0];
443,457c381,386
< fdo_write->fd = fds[1];//set write pipe
< }
< } else {
< //Open file
< int fd = open(fdo->filename.c_str(), fdo->flags, fdo->mode);
<
< if (fd == -1)
< panic("Unable to open file: %s", fdo->filename);
< fdo->fd = fd;
<
< //Seek to correct location before checkpoint
< if (lseek(fd, fdo->fileOffset, SEEK_SET) < 0)
< panic("Unable to seek to correct location in file: %s",
< fdo->filename);
< }
---
> FDEntry *fde_write = get_fd_entry(fde->readPipeSource);
> assert(fde_write->filename == "PIPE-WRITE");
> fde_write->fd = fds[1];
> } else {
> fde->fd = openFile(fde->filename.c_str(), fde->flags, fde->mode);
> seek(fde);
465,472c394,396
< for (int free_fd = 0; free_fd < NUM_FDS; ++free_fd) {
< Process::FdMap *fdo = &fd_map[free_fd];
< if (fdo->fd != -1) {
< fdo->fileOffset = lseek(fdo->fd, 0, SEEK_CUR);
< } else {
< fdo->filename = "NULL";
< fdo->fileOffset = 0;
< }
---
> for (auto& fde : *fd_array) {
> if (fde.fd != -1)
> fde.fileOffset = lseek(fde.fd, 0, SEEK_CUR);
479,480c403,405
< Process::FdMap *fdo = &fd_map[read_pipe_fd];
< fdo->readPipeSource = source_fd;
---
> FDEntry *fde = get_fd_entry(read_pipe_fd);
> assert(source_fd >= -1);
> fde->readPipeSource = source_fd;
484,505d408
< Process::FdMap::serialize(CheckpointOut &cp) const
< {
< SERIALIZE_SCALAR(fd);
< SERIALIZE_SCALAR(isPipe);
< SERIALIZE_SCALAR(filename);
< SERIALIZE_SCALAR(flags);
< SERIALIZE_SCALAR(readPipeSource);
< SERIALIZE_SCALAR(fileOffset);
< }
<
< void
< Process::FdMap::unserialize(CheckpointIn &cp)
< {
< UNSERIALIZE_SCALAR(fd);
< UNSERIALIZE_SCALAR(isPipe);
< UNSERIALIZE_SCALAR(filename);
< UNSERIALIZE_SCALAR(flags);
< UNSERIALIZE_SCALAR(readPipeSource);
< UNSERIALIZE_SCALAR(fileOffset);
< }
<
< void
518,519c421,422
< for (int x = 0; x < NUM_FDS; x++) {
< fd_map[x].serializeSection(cp, csprintf("FdMap%d", x));
---
> for (int x = 0; x < fd_array->size(); x++) {
> (*fd_array)[x].serializeSection(cp, csprintf("FDEntry%d", x));
538,539c441,443
< for (int x = 0; x < NUM_FDS; x++) {
< fd_map[x].unserializeSection(cp, csprintf("FdMap%d", x));
---
> for (int x = 0; x < fd_array->size(); x++) {
> FDEntry *fde = get_fd_entry(x);
> fde->unserializeSection(cp, csprintf("FDEntry%d", x));
545c449
< // but in this case we'll just stick with the instantianted value if not
---
> // but in this case we'll just stick with the instantiated value if not
> #include <map>
105a107,127
> static int
> openFile(const string& filename, int flags, mode_t mode)
> {
> int sim_fd = open(filename.c_str(), flags, mode);
> if (sim_fd != -1)
> return sim_fd;
> fatal("Unable to open %s with mode %O", filename, mode);
> }
>
> static int
> openInputFile(const string &filename)
> {
> return openFile(filename, O_RDONLY, 0);
> }
>
> static int
> openOutputFile(const string &filename)
> {
> return openFile(filename, O_WRONLY | O_CREAT | O_TRUNC, 0664);
> }
>
119c141,149
< fd_map(new FdMap[NUM_FDS])
---
> fd_array(make_shared<array<FDEntry, NUM_FDS>>()),
> imap {{"", -1},
> {"cin", STDIN_FILENO},
> {"stdin", STDIN_FILENO}},
> oemap{{"", -1},
> {"cout", STDOUT_FILENO},
> {"stdout", STDOUT_FILENO},
> {"cerr", STDERR_FILENO},
> {"stderr", STDERR_FILENO}}
121,123c151,152
< string in = params->input;
< string out = params->output;
< string err = params->errout;
---
> int sim_fd;
> std::map<string,int>::iterator it;
125,131c154,158
< // initialize file descriptors to default: same as simulator
< int stdin_fd, stdout_fd, stderr_fd;
<
< if (in == "stdin" || in == "cin")
< stdin_fd = STDIN_FILENO;
< else if (in == "None")
< stdin_fd = -1;
---
> // Search through the input options and set fd if match is found;
> // otherwise, open an input file and seek to location.
> FDEntry *fde_stdin = get_fd_entry(STDIN_FILENO);
> if ((it = imap.find(params->input)) != imap.end())
> sim_fd = it->second;
133c160,161
< stdin_fd = Process::openInputFile(in);
---
> sim_fd = openInputFile(params->input);
> fde_stdin->set(sim_fd, params->input, O_RDONLY, -1, false);
135,140c163,167
< if (out == "stdout" || out == "cout")
< stdout_fd = STDOUT_FILENO;
< else if (out == "stderr" || out == "cerr")
< stdout_fd = STDERR_FILENO;
< else if (out == "None")
< stdout_fd = -1;
---
> // Search through the output/error options and set fd if match is found;
> // otherwise, open an output file and seek to location.
> FDEntry *fde_stdout = get_fd_entry(STDOUT_FILENO);
> if ((it = oemap.find(params->output)) != oemap.end())
> sim_fd = it->second;
142c169,171
< stdout_fd = Process::openOutputFile(out);
---
> sim_fd = openOutputFile(params->output);
> fde_stdout->set(sim_fd, params->output, O_WRONLY | O_CREAT | O_TRUNC,
> 0664, false);
144,151c173,178
< if (err == "stdout" || err == "cout")
< stderr_fd = STDOUT_FILENO;
< else if (err == "stderr" || err == "cerr")
< stderr_fd = STDERR_FILENO;
< else if (err == "None")
< stderr_fd = -1;
< else if (err == out)
< stderr_fd = stdout_fd;
---
> FDEntry *fde_stderr = get_fd_entry(STDERR_FILENO);
> if (params->output == params->errout)
> // Reuse the same file descriptor if these match.
> sim_fd = fde_stdout->fd;
> else if ((it = oemap.find(params->errout)) != oemap.end())
> sim_fd = it->second;
153c180,182
< stderr_fd = Process::openOutputFile(err);
---
> sim_fd = openOutputFile(params->errout);
> fde_stderr->set(sim_fd, params->errout, O_WRONLY | O_CREAT | O_TRUNC,
> 0664, false);
155,183d183
< // initialize first 3 fds (stdin, stdout, stderr)
< Process::FdMap *fdo = &fd_map[STDIN_FILENO];
< fdo->fd = stdin_fd;
< fdo->filename = in;
< fdo->flags = O_RDONLY;
< fdo->mode = -1;
< fdo->fileOffset = 0;
<
< fdo = &fd_map[STDOUT_FILENO];
< fdo->fd = stdout_fd;
< fdo->filename = out;
< fdo->flags = O_WRONLY | O_CREAT | O_TRUNC;
< fdo->mode = 0774;
< fdo->fileOffset = 0;
<
< fdo = &fd_map[STDERR_FILENO];
< fdo->fd = stderr_fd;
< fdo->filename = err;
< fdo->flags = O_WRONLY;
< fdo->mode = -1;
< fdo->fileOffset = 0;
<
<
< // mark remaining fds as free
< for (int i = 3; i < NUM_FDS; ++i) {
< fdo = &fd_map[i];
< fdo->fd = -1;
< }
<
201,206c201,202
< //
< // static helper functions
< //
<
< int
< Process::openInputFile(const string &filename)
---
> void
> Process::inheritFdArray(Process *p)
208,216c204
< int fd = open(filename.c_str(), O_RDONLY);
<
< if (fd == -1) {
< perror(NULL);
< cerr << "unable to open \"" << filename << "\" for reading\n";
< fatal("can't open input file");
< }
<
< return fd;
---
> fd_array = p->fd_array;
219,233d206
<
< int
< Process::openOutputFile(const string &filename)
< {
< int fd = open(filename.c_str(), O_WRONLY | O_CREAT | O_TRUNC, 0664);
<
< if (fd == -1) {
< perror(NULL);
< cerr << "unable to open \"" << filename << "\" for writing\n";
< fatal("can't open output file");
< }
<
< return fd;
< }
<
271d243
< // in case open() returns an error, don't allocate a new fd
275,285c247,250
< // find first free target fd
< for (int free_fd = 0; free_fd < NUM_FDS; ++free_fd) {
< Process::FdMap *fdo = &fd_map[free_fd];
< if (fdo->fd == -1 && fdo->driver == NULL) {
< fdo->fd = sim_fd;
< fdo->filename = filename;
< fdo->mode = mode;
< fdo->fileOffset = 0;
< fdo->flags = flags;
< fdo->isPipe = pipe;
< fdo->readPipeSource = 0;
---
> for (int free_fd = 0; free_fd < fd_array->size(); free_fd++) {
> FDEntry *fde = get_fd_entry(free_fd);
> if (fde->isFree()) {
> fde->set(sim_fd, filename, flags, mode, pipe);
290c255
< panic("Process::alloc_fd: out of file descriptors!");
---
> fatal("Out of target file descriptors");
294c259
< Process::free_fdmap_entry(int tgt_fd)
---
> Process::reset_fd_entry(int tgt_fd)
296,297c261,262
< Process::FdMap *fdo = &fd_map[tgt_fd];
< assert(fd_map[tgt_fd].fd > -1);
---
> FDEntry *fde = get_fd_entry(tgt_fd);
> assert(fde->fd > -1);
299,306c264
< fdo->fd = -1;
< fdo->filename = "NULL";
< fdo->mode = 0;
< fdo->fileOffset = 0;
< fdo->flags = 0;
< fdo->isPipe = false;
< fdo->readPipeSource = 0;
< fdo->driver = NULL;
---
> fde->reset();
312,313c270,271
< FdMap *obj = sim_fd_obj(tgt_fd);
< return obj ? obj->fd : -1;
---
> FDEntry *entry = get_fd_entry(tgt_fd);
> return entry ? entry->fd : -1;
316,317c274,275
< Process::FdMap *
< Process::sim_fd_obj(int tgt_fd)
---
> FDEntry *
> Process::get_fd_entry(int tgt_fd)
319,321c277,278
< if (tgt_fd < 0 || tgt_fd >= NUM_FDS)
< return NULL;
< return &fd_map[tgt_fd];
---
> assert(0 <= tgt_fd && tgt_fd < fd_array->size());
> return &(*fd_array)[tgt_fd];
327,328c284,285
< for (int index = 0; index < NUM_FDS; ++index)
< if (fd_map[index].fd == sim_fd)
---
> for (int index = 0; index < fd_array->size(); index++)
> if ((*fd_array)[index].fd == sim_fd)
366d322
< // find all offsets for currently open files and save them
370,375c326,330
< Process::FdMap *fdo_stdin = &fd_map[STDIN_FILENO];
< Process::FdMap *fdo_stdout = &fd_map[STDOUT_FILENO];
< Process::FdMap *fdo_stderr = &fd_map[STDERR_FILENO];
< string in = fdo_stdin->filename;
< string out = fdo_stdout->filename;
< string err = fdo_stderr->filename;
---
> auto seek = [] (FDEntry *fde)
> {
> if (lseek(fde->fd, fde->fileOffset, SEEK_SET) < 0)
> fatal("Unable to see to location in %s", fde->filename);
> };
377,378c332
< // initialize file descriptors to default: same as simulator
< int stdin_fd, stdout_fd, stderr_fd;
---
> std::map<string,int>::iterator it;
380,388c334,341
< if (in == "stdin" || in == "cin")
< stdin_fd = STDIN_FILENO;
< else if (in == "NULL")
< stdin_fd = -1;
< else {
< // open standard in and seek to the right location
< stdin_fd = Process::openInputFile(in);
< if (lseek(stdin_fd, fdo_stdin->fileOffset, SEEK_SET) < 0)
< panic("Unable to seek to correct location in file: %s", in);
---
> // Search through the input options and set fd if match is found;
> // otherwise, open an input file and seek to location.
> FDEntry *fde_stdin = get_fd_entry(STDIN_FILENO);
> if ((it = imap.find(fde_stdin->filename)) != imap.end()) {
> fde_stdin->fd = it->second;
> } else {
> fde_stdin->fd = openInputFile(fde_stdin->filename);
> seek(fde_stdin);
391,400c344,351
< if (out == "stdout" || out == "cout")
< stdout_fd = STDOUT_FILENO;
< else if (out == "stderr" || out == "cerr")
< stdout_fd = STDERR_FILENO;
< else if (out == "NULL")
< stdout_fd = -1;
< else {
< stdout_fd = Process::openOutputFile(out);
< if (lseek(stdout_fd, fdo_stdout->fileOffset, SEEK_SET) < 0)
< panic("Unable to seek to correct location in file: %s", out);
---
> // Search through the output/error options and set fd if match is found;
> // otherwise, open an output file and seek to location.
> FDEntry *fde_stdout = get_fd_entry(STDOUT_FILENO);
> if ((it = oemap.find(fde_stdout->filename)) != oemap.end()) {
> fde_stdout->fd = it->second;
> } else {
> fde_stdout->fd = openOutputFile(fde_stdout->filename);
> seek(fde_stdout);
403,414c354,362
< if (err == "stdout" || err == "cout")
< stderr_fd = STDOUT_FILENO;
< else if (err == "stderr" || err == "cerr")
< stderr_fd = STDERR_FILENO;
< else if (err == "NULL")
< stderr_fd = -1;
< else if (err == out)
< stderr_fd = stdout_fd;
< else {
< stderr_fd = Process::openOutputFile(err);
< if (lseek(stderr_fd, fdo_stderr->fileOffset, SEEK_SET) < 0)
< panic("Unable to seek to correct location in file: %s", err);
---
> FDEntry *fde_stderr = get_fd_entry(STDERR_FILENO);
> if (fde_stdout->filename == fde_stderr->filename) {
> // Reuse the same file descriptor if these match.
> fde_stderr->fd = fde_stdout->fd;
> } else if ((it = oemap.find(fde_stderr->filename)) != oemap.end()) {
> fde_stderr->fd = it->second;
> } else {
> fde_stderr->fd = openOutputFile(fde_stderr->filename);
> seek(fde_stderr);
417,419c365,368
< fdo_stdin->fd = stdin_fd;
< fdo_stdout->fd = stdout_fd;
< fdo_stderr->fd = stderr_fd;
---
> for (int tgt_fd = 3; tgt_fd < fd_array->size(); tgt_fd++) {
> FDEntry *fde = get_fd_entry(tgt_fd);
> if (fde->fd == -1)
> continue;
420a370,373
> if (fde->isPipe) {
> if (fde->filename == "PIPE-WRITE")
> continue;
> assert(fde->filename == "PIPE-READ");
422,432c375,377
< for (int free_fd = 3; free_fd < NUM_FDS; ++free_fd) {
< Process::FdMap *fdo = &fd_map[free_fd];
< if (fdo->fd != -1) {
< if (fdo->isPipe){
< if (fdo->filename == "PIPE-WRITE")
< continue;
< else {
< assert (fdo->filename == "PIPE-READ");
< //create a new pipe
< int fds[2];
< int pipe_retval = pipe(fds);
---
> int fds[2];
> if (pipe(fds) < 0)
> fatal("Unable to create new pipe");
434,441c379
< if (pipe_retval < 0) {
< // error
< panic("Unable to create new pipe.");
< }
< fdo->fd = fds[0]; //set read pipe
< Process::FdMap *fdo_write = &fd_map[fdo->readPipeSource];
< if (fdo_write->filename != "PIPE-WRITE")
< panic ("Couldn't find write end of the pipe");
---
> fde->fd = fds[0];
443,457c381,386
< fdo_write->fd = fds[1];//set write pipe
< }
< } else {
< //Open file
< int fd = open(fdo->filename.c_str(), fdo->flags, fdo->mode);
<
< if (fd == -1)
< panic("Unable to open file: %s", fdo->filename);
< fdo->fd = fd;
<
< //Seek to correct location before checkpoint
< if (lseek(fd, fdo->fileOffset, SEEK_SET) < 0)
< panic("Unable to seek to correct location in file: %s",
< fdo->filename);
< }
---
> FDEntry *fde_write = get_fd_entry(fde->readPipeSource);
> assert(fde_write->filename == "PIPE-WRITE");
> fde_write->fd = fds[1];
> } else {
> fde->fd = openFile(fde->filename.c_str(), fde->flags, fde->mode);
> seek(fde);
465,472c394,396
< for (int free_fd = 0; free_fd < NUM_FDS; ++free_fd) {
< Process::FdMap *fdo = &fd_map[free_fd];
< if (fdo->fd != -1) {
< fdo->fileOffset = lseek(fdo->fd, 0, SEEK_CUR);
< } else {
< fdo->filename = "NULL";
< fdo->fileOffset = 0;
< }
---
> for (auto& fde : *fd_array) {
> if (fde.fd != -1)
> fde.fileOffset = lseek(fde.fd, 0, SEEK_CUR);
479,480c403,405
< Process::FdMap *fdo = &fd_map[read_pipe_fd];
< fdo->readPipeSource = source_fd;
---
> FDEntry *fde = get_fd_entry(read_pipe_fd);
> assert(source_fd >= -1);
> fde->readPipeSource = source_fd;
484,505d408
< Process::FdMap::serialize(CheckpointOut &cp) const
< {
< SERIALIZE_SCALAR(fd);
< SERIALIZE_SCALAR(isPipe);
< SERIALIZE_SCALAR(filename);
< SERIALIZE_SCALAR(flags);
< SERIALIZE_SCALAR(readPipeSource);
< SERIALIZE_SCALAR(fileOffset);
< }
<
< void
< Process::FdMap::unserialize(CheckpointIn &cp)
< {
< UNSERIALIZE_SCALAR(fd);
< UNSERIALIZE_SCALAR(isPipe);
< UNSERIALIZE_SCALAR(filename);
< UNSERIALIZE_SCALAR(flags);
< UNSERIALIZE_SCALAR(readPipeSource);
< UNSERIALIZE_SCALAR(fileOffset);
< }
<
< void
518,519c421,422
< for (int x = 0; x < NUM_FDS; x++) {
< fd_map[x].serializeSection(cp, csprintf("FdMap%d", x));
---
> for (int x = 0; x < fd_array->size(); x++) {
> (*fd_array)[x].serializeSection(cp, csprintf("FDEntry%d", x));
538,539c441,443
< for (int x = 0; x < NUM_FDS; x++) {
< fd_map[x].unserializeSection(cp, csprintf("FdMap%d", x));
---
> for (int x = 0; x < fd_array->size(); x++) {
> FDEntry *fde = get_fd_entry(x);
> fde->unserializeSection(cp, csprintf("FDEntry%d", x));
545c449
< // but in this case we'll just stick with the instantianted value if not
---
> // but in this case we'll just stick with the instantiated value if not