changeset ddc3d96d6313 in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=ddc3d96d6313
description:
base: refactor process class (specifically FdMap and friends)
This patch extends the previous patch's alterations around fd_map. It
cleans
up some of the uglier code in the process file and replaces it with a
more
concise C++11 version. As part of the changes, the FdMap class is
pulled out
of the Process class and receives its own file.
diffstat:
src/sim/SConscript | 1 +
src/sim/fd_entry.cc | 91 +++++++++++
src/sim/fd_entry.hh | 92 +++++++++++
src/sim/process.cc | 374 +++++++++++++++++------------------------------
src/sim/process.hh | 40 +---
src/sim/serialize.hh | 2 +-
src/sim/syscall_emul.cc | 6 +-
src/sim/syscall_emul.hh | 22 +-
util/cpt_upgrader.py | 33 ++++
9 files changed, 383 insertions(+), 278 deletions(-)
diffs (truncated from 934 to 300 lines):
diff -r b2bbfec74eca -r ddc3d96d6313 src/sim/SConscript
--- a/src/sim/SConscript Fri Jul 24 12:25:22 2015 -0700
+++ b/src/sim/SConscript Fri Jul 24 12:25:22 2015 -0700
@@ -72,6 +72,7 @@
SimObject('Process.py')
Source('faults.cc')
Source('process.cc')
+ Source('fd_entry.cc')
Source('pseudo_inst.cc')
Source('syscall_emul.cc')
diff -r b2bbfec74eca -r ddc3d96d6313 src/sim/fd_entry.cc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/sim/fd_entry.cc Fri Jul 24 12:25:22 2015 -0700
@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2015 Advanced Micro Devices, Inc.
+ * Copyright (c) 2001-2005 The Regents of The University of Michigan
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met: redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer;
+ * redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution;
+ * neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Authors: Nathan Binkert
+ * Steve Reinhardt
+ */
+
+#include "base/misc.hh"
+#include "fd_entry.hh"
+
+using namespace std;
+
+void
+FDEntry::serialize(CheckpointOut &cp) const
+{
+ SERIALIZE_SCALAR(fd);
+ if (fd != -1) {
+ SERIALIZE_SCALAR(mode);
+ SERIALIZE_SCALAR(flags);
+ SERIALIZE_SCALAR(isPipe);
+ SERIALIZE_SCALAR(readPipeSource);
+ SERIALIZE_SCALAR(fileOffset);
+ SERIALIZE_SCALAR(filename);
+ }
+ if (driver)
+ warn("EmulatedDriver objects do not currently support checkpoints");
+}
+
+void
+FDEntry::unserialize(CheckpointIn &cp)
+{
+ UNSERIALIZE_SCALAR(fd);
+ if (fd != -1) {
+ UNSERIALIZE_SCALAR(mode);
+ UNSERIALIZE_SCALAR(flags);
+ UNSERIALIZE_SCALAR(isPipe);
+ UNSERIALIZE_SCALAR(readPipeSource);
+ UNSERIALIZE_SCALAR(fileOffset);
+ UNSERIALIZE_SCALAR(filename);
+ }
+ driver = NULL;
+}
+
+bool
+FDEntry::isFree()
+{
+ return (fd == -1 && driver == NULL);
+}
+
+void
+FDEntry::set(int sim_fd, const string name, int flags, int mode, bool pipe)
+{
+ fd = sim_fd;
+ filename = name;
+ this->flags = flags;
+ this->mode = mode;
+ isPipe = pipe;
+ fileOffset = 0;
+ readPipeSource = 0;
+ driver = NULL;
+}
+
+void
+FDEntry::reset()
+{
+ set(-1, "", 0, 0, false);
+}
diff -r b2bbfec74eca -r ddc3d96d6313 src/sim/fd_entry.hh
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/sim/fd_entry.hh Fri Jul 24 12:25:22 2015 -0700
@@ -0,0 +1,92 @@
+/*
+ * Copyright (c) 2015 Advanced Micro Devices, Inc.
+ * Copyright (c) 2001-2005 The Regents of The University of Michigan
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met: redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer;
+ * redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution;
+ * neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Authors: Nathan Binkert
+ * Steve Reinhardt
+ */
+
+#ifndef __FD_ENTRY_HH__
+#define __FD_ENTRY_HH__
+
+#include <ostream>
+#include <string>
+
+#include "sim/emul_driver.hh"
+
+/**
+ * FDEntry is used to manage a single file descriptor mapping and metadata
+ * for processes.
+ * Note that the fields are all declared publicly since system calls have a
+ * habit of only needing to access a single field at a time and accessor
+ * methods seem like overkill.
+ */
+class FDEntry : public Serializable
+{
+ public:
+ /**
+ * Constructor contains default values
+ * The file descriptor is free.
+ */
+ FDEntry()
+ : fd(-1), mode(0), flags(0), isPipe(false), readPipeSource(0),
+ fileOffset(0), filename(""), driver(NULL)
+ { }
+
+ void serialize(CheckpointOut &cp) const M5_ATTR_OVERRIDE;
+ void unserialize(CheckpointIn &cp) M5_ATTR_OVERRIDE;
+
+ /**
+ * Check if the target file descriptor is in use.
+ * @return value denoting if target file descriptor already used
+ */
+ bool isFree();
+
+ /**
+ * Fill in members for this file descriptor entry.
+ * @param sim_fd host file descriptor
+ * @param name filename string
+ * @param flags current flags of the file descriptor
+ * @param mode current mode of the file descriptor
+ * @param pipe denotes whether the file descriptor belongs to a pipe
+ */
+ void set(int sim_fd, const std::string name, int flags, int mode,
+ bool pipe);
+
+ /** Reset members to their default values. */
+ void reset();
+
+ int fd;
+ int mode;
+ int flags;
+ bool isPipe;
+ int readPipeSource;
+ uint64_t fileOffset;
+ std::string filename;
+ EmulatedDriver *driver;
+};
+
+#endif // __FD_ENTRY_HH__
diff -r b2bbfec74eca -r ddc3d96d6313 src/sim/process.cc
--- a/src/sim/process.cc Fri Jul 24 12:25:22 2015 -0700
+++ b/src/sim/process.cc Fri Jul 24 12:25:22 2015 -0700
@@ -47,6 +47,7 @@
#include <unistd.h>
#include <cstdio>
+#include <map>
#include <string>
#include "base/loader/object_file.hh"
@@ -103,6 +104,27 @@
template struct AuxVector<uint32_t>;
template struct AuxVector<uint64_t>;
+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);
+}
+
Process::Process(ProcessParams * params)
: SimObject(params), system(params->system),
brk_point(0), stack_base(0), stack_size(0), stack_min(0),
@@ -116,70 +138,48 @@
static_cast<PageTableBase *>(new FuncPageTable(name(), M5_pid)) ),
initVirtMem(system->getSystemPort(), this,
SETranslatingPortProxy::Always),
- 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}}
{
- string in = params->input;
- string out = params->output;
- string err = params->errout;
+ int sim_fd;
+ std::map<string,int>::iterator it;
- // initialize file descriptors to default: same as simulator
- int stdin_fd, stdout_fd, stderr_fd;
+ // 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;
+ else
+ sim_fd = openInputFile(params->input);
+ fde_stdin->set(sim_fd, params->input, O_RDONLY, -1, false);
- if (in == "stdin" || in == "cin")
- stdin_fd = STDIN_FILENO;
- else if (in == "None")
- stdin_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;
else
- stdin_fd = Process::openInputFile(in);
+ sim_fd = openOutputFile(params->output);
+ fde_stdout->set(sim_fd, params->output, O_WRONLY | O_CREAT | O_TRUNC,
+ 0664, false);
- 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;
+ 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;
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
