changeset 2a5e4070155e in /z/repo/m5
details: http://repo.m5sim.org/m5?cmd=changeset;node=2a5e4070155e
description:
process: minor format/style cleanup
diffstat:
src/sim/process.cc | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 deletions(-)
diffs (88 lines):
diff -r 3006bde825fd -r 2a5e4070155e src/sim/process.cc
--- a/src/sim/process.cc Tue Jun 22 15:36:07 2010 -0700
+++ b/src/sim/process.cc Mon Jul 05 21:39:38 2010 -0700
@@ -327,6 +327,7 @@
return &fd_map[tgt_fd];
}
+
bool
Process::checkAndAllocNextPage(Addr vaddr)
{
@@ -353,9 +354,10 @@
return false;
}
- // find all offsets for currently open files and save them
+// find all offsets for currently open files and save them
void
-Process::fix_file_offsets() {
+Process::fix_file_offsets()
+{
Process::FdMap *fdo_stdin = &fd_map[STDIN_FILENO];
Process::FdMap *fdo_stdout = &fd_map[STDOUT_FILENO];
Process::FdMap *fdo_stderr = &fd_map[STDERR_FILENO];
@@ -370,8 +372,8 @@
stdin_fd = STDIN_FILENO;
else if (in == "None")
stdin_fd = -1;
- else{
- //OPEN standard in and seek to the right location
+ 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);
@@ -383,7 +385,7 @@
stdout_fd = STDERR_FILENO;
else if (out == "None")
stdout_fd = -1;
- else{
+ 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);
@@ -441,18 +443,21 @@
//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);
+ panic("Unable to seek to correct location in file: %s",
+ fdo->filename);
}
}
}
}
+
void
-Process::find_file_offsets(){
+Process::find_file_offsets()
+{
for (int free_fd = 0; free_fd <= MAX_FD; ++free_fd) {
Process::FdMap *fdo = &fd_map[free_fd];
if (fdo->fd != -1) {
fdo->fileOffset = lseek(fdo->fd, 0, SEEK_CUR);
- } else {
+ } else {
fdo->filename = "NULL";
fdo->fileOffset = 0;
}
@@ -460,7 +465,8 @@
}
void
-Process::setReadPipeSource(int read_pipe_fd, int source_fd){
+Process::setReadPipeSource(int read_pipe_fd, int source_fd)
+{
Process::FdMap *fdo = &fd_map[read_pipe_fd];
fdo->readPipeSource = source_fd;
}
@@ -526,7 +532,7 @@
pTable->unserialize(cp, section);
for (int x = 0; x <= MAX_FD; x++) {
fd_map[x].unserialize(cp, csprintf("%s.FdMap%d", section, x));
- }
+ }
fix_file_offsets();
UNSERIALIZE_OPT_SCALAR(M5_pid);
// The above returns a bool so that you could do something if you don't
_______________________________________________
m5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/m5-dev
