diff options
| author | Brandon Potter <brandon.potter@amd.com> | 2016-11-09 14:27:40 -0600 |
|---|---|---|
| committer | Brandon Potter <brandon.potter@amd.com> | 2016-11-09 14:27:40 -0600 |
| commit | e3875215270220e5142a93848f74ccde9d61b244 (patch) | |
| tree | b0b6c47320a35d3b7661f54932229611b4a06150 /src/sim/process.cc | |
| parent | a928a438b8a005e5b6059bc5db0687bf64abcfa6 (diff) | |
| download | gem5-e3875215270220e5142a93848f74ccde9d61b244.tar.xz | |
syscall_emul: [patch 4/22] remove redundant M5_pid field from process
Diffstat (limited to 'src/sim/process.cc')
| -rw-r--r-- | src/sim/process.cc | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/sim/process.cc b/src/sim/process.cc index 560870c96..ff6297bbb 100644 --- a/src/sim/process.cc +++ b/src/sim/process.cc @@ -131,12 +131,11 @@ Process::Process(ProcessParams * params) brk_point(0), stack_base(0), stack_size(0), stack_min(0), max_stack_size(params->max_stack_size), next_thread_stack_base(0), - M5_pid(system->allocatePID()), useArchPT(params->useArchPT), kvmInSE(params->kvmInSE), pTable(useArchPT ? - static_cast<PageTableBase *>(new ArchPageTable(name(), M5_pid, system)) : - static_cast<PageTableBase *>(new FuncPageTable(name(), M5_pid)) ), + static_cast<PageTableBase *>(new ArchPageTable(name(), _pid, system)) : + static_cast<PageTableBase *>(new FuncPageTable(name(), _pid))), initVirtMem(system->getSystemPort(), this, SETranslatingPortProxy::Always), fd_array(make_shared<array<FDEntry, NUM_FDS>>()), @@ -147,7 +146,10 @@ Process::Process(ProcessParams * params) {"cout", STDOUT_FILENO}, {"stdout", STDOUT_FILENO}, {"cerr", STDERR_FILENO}, - {"stderr", STDERR_FILENO}} + {"stderr", STDERR_FILENO}}, + _uid(params->uid), _euid(params->euid), + _gid(params->gid), _egid(params->egid), + _pid(params->pid), _ppid(params->ppid) { int sim_fd; std::map<string,int>::iterator it; @@ -457,7 +459,6 @@ Process::serialize(CheckpointOut &cp) const for (int x = 0; x < fd_array->size(); x++) { (*fd_array)[x].serializeSection(cp, csprintf("FDEntry%d", x)); } - SERIALIZE_SCALAR(M5_pid); } @@ -478,7 +479,6 @@ Process::unserialize(CheckpointIn &cp) fde->unserializeSection(cp, csprintf("FDEntry%d", x)); } fixFileOffsets(); - UNSERIALIZE_OPT_SCALAR(M5_pid); // The above returns a bool so that you could do something if you don't // find the param in the checkpoint if you wanted to, like set a default // but in this case we'll just stick with the instantiated value if not @@ -506,9 +506,6 @@ LiveProcess::LiveProcess(LiveProcessParams *params, ObjectFile *_objFile) : Process(params), objFile(_objFile), argv(params->cmd), envp(params->env), cwd(params->cwd), executable(params->executable), - __uid(params->uid), __euid(params->euid), - __gid(params->gid), __egid(params->egid), - __pid(params->pid), __ppid(params->ppid), drivers(params->drivers) { |