Implement current working directory for LiveProcesses

--HG--
extra : convert_revision : a2d3cf29ab65c61af27d82a8c421a41a19fd5aeb

src/arch/alpha/linux/process.cc

@@ -576,6 +576,7 @@ AlphaLinuxProcess::AlphaLinuxProcess(const std::string &name,
                                      int stderr_fd,
                                      std::vector<std::string> &argv,
                                      std::vector<std::string> &envp,
+                                     const std::string &cwd,
                                      uint64_t _uid,
                                      uint64_t _euid,
                                      uint64_t _gid,
@@ -583,7 +584,7 @@ AlphaLinuxProcess::AlphaLinuxProcess(const std::string &name,
                                      uint64_t _pid,
                                      uint64_t _ppid)
     : AlphaLiveProcess(name, objFile, system, stdin_fd, stdout_fd,
-            stderr_fd, argv, envp, _uid, _euid, _gid, _egid, _pid, _ppid),
+           stderr_fd, argv, envp, cwd, _uid, _euid, _gid, _egid, _pid, _ppid),
      Num_Syscall_Descs(sizeof(syscallDescs) / sizeof(SyscallDesc))
 {
     //init_regs->intRegFile[0] = 0;

src/arch/alpha/linux/process.hh

@@ -46,6 +46,7 @@ class AlphaLinuxProcess : public AlphaLiveProcess
                       int stdin_fd, int stdout_fd, int stderr_fd,
                       std::vector<std::string> &argv,
                       std::vector<std::string> &envp,
+                      const std::string &cwd,
                       uint64_t _uid, uint64_t _euid,
                       uint64_t _gid, uint64_t _egid,
                       uint64_t _pid, uint64_t _ppid);

src/arch/alpha/process.cc

@@ -43,10 +43,11 @@ using namespace std;
 AlphaLiveProcess::AlphaLiveProcess(const std::string &nm, ObjectFile *objFile,
         System *_system, int stdin_fd, int stdout_fd, int stderr_fd,
         std::vector<std::string> &argv, std::vector<std::string> &envp,
+        const std::string &cwd,
         uint64_t _uid, uint64_t _euid, uint64_t _gid, uint64_t _egid,
         uint64_t _pid, uint64_t _ppid)
     : LiveProcess(nm, objFile, _system, stdin_fd, stdout_fd, stderr_fd,
-        argv, envp, _uid, _euid, _gid, _egid, _pid, _ppid)
+        argv, envp, cwd, _uid, _euid, _gid, _egid, _pid, _ppid)
 {
     brk_point = objFile->dataBase() + objFile->dataSize() + objFile->bssSize();
     brk_point = roundUp(brk_point, VMPageSize);

src/arch/alpha/process.hh

@@ -47,6 +47,7 @@ class AlphaLiveProcess : public LiveProcess
                 System *_system, int stdin_fd, int stdout_fd, int stderr_fd,
                 std::vector<std::string> &argv,
                 std::vector<std::string> &envp,
+                const std::string &cwd,
                 uint64_t _uid, uint64_t _euid,
                 uint64_t _gid, uint64_t _egid,
                 uint64_t _pid, uint64_t _ppid);

src/arch/alpha/tru64/process.cc

@@ -581,11 +581,12 @@ AlphaTru64Process::AlphaTru64Process(const std::string &name,
                                      int stderr_fd,
                                      std::vector<std::string> &argv,
                                      std::vector<std::string> &envp,
+                                     const std::string &cwd,
                                      uint64_t _uid, uint64_t _euid,
                                      uint64_t _gid, uint64_t _egid,
                                      uint64_t _pid, uint64_t _ppid)
     : AlphaLiveProcess(name, objFile, system, stdin_fd, stdout_fd,
-            stderr_fd, argv, envp, _uid, _euid, _gid, _egid, _pid, _ppid),
+            stderr_fd, argv, envp, cwd, _uid, _euid, _gid, _egid, _pid, _ppid),
       Num_Syscall_Descs(sizeof(syscallDescs) / sizeof(SyscallDesc)),
       Num_Mach_Syscall_Descs(sizeof(machSyscallDescs) / sizeof(SyscallDesc))
 {

src/arch/alpha/tru64/process.hh

@@ -45,6 +45,7 @@ class AlphaTru64Process : public AlphaLiveProcess
                       int stdin_fd, int stdout_fd, int stderr_fd,
                       std::vector<std::string> &argv,
                       std::vector<std::string> &envp,
+                      const std::string &cwd,
                       uint64_t _uid, uint64_t _euid,
                       uint64_t _gid, uint64_t _egid,
                       uint64_t _pid, uint64_t _ppid);

src/arch/mips/linux/process.cc

@@ -411,6 +411,7 @@ MipsLinuxProcess::MipsLinuxProcess(const std::string &name,
                                      int stderr_fd,
                                      std::vector<std::string> &argv,
                                      std::vector<std::string> &envp,
+                                     const std::string &cwd,
                                      uint64_t _uid,
                                      uint64_t _euid,
                                      uint64_t _gid,
@@ -418,7 +419,7 @@ MipsLinuxProcess::MipsLinuxProcess(const std::string &name,
                                      uint64_t _pid,
                                      uint64_t _ppid)
     : MipsLiveProcess(name, objFile, system, stdin_fd, stdout_fd, stderr_fd,
-                      argv, envp, _uid, _euid, _gid, _egid, _pid, _ppid),
+                      argv, envp, cwd, _uid, _euid, _gid, _egid, _pid, _ppid),
      Num_Syscall_Descs(sizeof(syscallDescs) / sizeof(SyscallDesc))
 { }
 

src/arch/mips/linux/process.hh

@@ -43,6 +43,7 @@ class MipsLinuxProcess : public MipsLiveProcess
                       int stdin_fd, int stdout_fd, int stderr_fd,
                       std::vector<std::string> &argv,
                       std::vector<std::string> &envp,
+                      const std::string &cwd,
                       uint64_t _uid, uint64_t _euid,
                       uint64_t _gid, uint64_t _egid,
                       uint64_t _pid, uint64_t _ppid);

src/arch/mips/process.cc

@@ -44,10 +44,11 @@ using namespace MipsISA;
 MipsLiveProcess::MipsLiveProcess(const std::string &nm, ObjectFile *objFile,
         System *_system, int stdin_fd, int stdout_fd, int stderr_fd,
         std::vector<std::string> &argv, std::vector<std::string> &envp,
+        const std::string &cwd,
         uint64_t _uid, uint64_t _euid, uint64_t _gid, uint64_t _egid,
         uint64_t _pid, uint64_t _ppid)
     : LiveProcess(nm, objFile, _system, stdin_fd, stdout_fd, stderr_fd,
-        argv, envp, _uid, _euid, _gid, _egid, _pid, _ppid)
+        argv, envp, cwd, _uid, _euid, _gid, _egid, _pid, _ppid)
 {
     // Set up stack. On MIPS, stack starts at the top of kuseg
     // user address space. MIPS stack grows down from here

src/arch/mips/process.hh

@@ -48,6 +48,7 @@ class MipsLiveProcess : public LiveProcess
                 System *_system, int stdin_fd, int stdout_fd, int stderr_fd,
                 std::vector<std::string> &argv,
                 std::vector<std::string> &envp,
+                const std::string &cwd,
                 uint64_t _uid, uint64_t _euid,
                 uint64_t _gid, uint64_t _egid,
                 uint64_t _pid, uint64_t _ppid);

src/arch/sparc/linux/process.cc

@@ -391,11 +391,12 @@ SparcLinuxProcess::SparcLinuxProcess(const std::string &name,
                                      int stderr_fd,
                                      std::vector<std::string> &argv,
                                      std::vector<std::string> &envp,
+                                     const std::string &cwd,
                                      uint64_t _uid, uint64_t _euid,
                                      uint64_t _gid, uint64_t _egid,
                                      uint64_t _pid, uint64_t _ppid)
     : SparcLiveProcess(name, objFile, system,
-            stdin_fd, stdout_fd, stderr_fd, argv, envp,
+            stdin_fd, stdout_fd, stderr_fd, argv, envp, cwd,
             _uid, _euid, _gid, _egid, _pid, _ppid),
      Num_Syscall_Descs(sizeof(syscallDescs) / sizeof(SyscallDesc))
 {

src/arch/sparc/linux/process.hh

@@ -49,6 +49,7 @@ class SparcLinuxProcess : public SparcLiveProcess
                       int stdin_fd, int stdout_fd, int stderr_fd,
                       std::vector<std::string> &argv,
                       std::vector<std::string> &envp,
+                      const std::string &cwd,
                       uint64_t _uid, uint64_t _euid,
                       uint64_t _gid, uint64_t _egid,
                       uint64_t _pid, uint64_t _ppid);

src/arch/sparc/process.cc

@@ -47,10 +47,11 @@ using namespace SparcISA;
 SparcLiveProcess::SparcLiveProcess(const std::string &nm, ObjectFile *objFile,
         System *_system, int stdin_fd, int stdout_fd, int stderr_fd,
         std::vector<std::string> &argv, std::vector<std::string> &envp,
+        const std::string &cwd,
         uint64_t _uid, uint64_t _euid, uint64_t _gid, uint64_t _egid,
         uint64_t _pid, uint64_t _ppid)
     : LiveProcess(nm, objFile, _system, stdin_fd, stdout_fd, stderr_fd,
-        argv, envp, _uid, _euid, _gid, _egid, _pid, _ppid)
+        argv, envp, cwd, _uid, _euid, _gid, _egid, _pid, _ppid)
 {
 
     // XXX all the below need to be updated for SPARC - Ali

src/arch/sparc/process.hh

@@ -64,6 +64,7 @@ class SparcLiveProcess : public LiveProcess
                 System *_system, int stdin_fd, int stdout_fd, int stderr_fd,
                 std::vector<std::string> &argv,
                 std::vector<std::string> &envp,
+                const std::string &cwd,
                 uint64_t _uid, uint64_t _euid,
                 uint64_t _gid, uint64_t _egid,
                 uint64_t _pid, uint64_t _ppid);

src/arch/sparc/solaris/process.cc

@@ -329,6 +329,7 @@ SparcSolarisProcess::SparcSolarisProcess(const std::string &name,
                                      int stderr_fd,
                                      std::vector<std::string> &argv,
                                      std::vector<std::string> &envp,
+                                     const std::string &cwd,
                                      uint64_t _uid,
                                      uint64_t _euid,
                                      uint64_t _gid,
@@ -336,7 +337,7 @@ SparcSolarisProcess::SparcSolarisProcess(const std::string &name,
                                      uint64_t _pid,
                                      uint64_t _ppid)
     : SparcLiveProcess(name, objFile, system,
-            stdin_fd, stdout_fd, stderr_fd, argv, envp,
+            stdin_fd, stdout_fd, stderr_fd, argv, envp, cwd,
             _uid, _euid, _gid, _egid, _pid, _ppid),
      Num_Syscall_Descs(sizeof(syscallDescs) / sizeof(SyscallDesc))
 {

src/arch/sparc/solaris/process.hh

@@ -48,6 +48,7 @@ class SparcSolarisProcess : public SparcLiveProcess
                       int stdin_fd, int stdout_fd, int stderr_fd,
                       std::vector<std::string> &argv,
                       std::vector<std::string> &envp,
+                      const std::string &cwd,
                       uint64_t _uid, uint64_t _euid,
                       uint64_t _gid, uint64_t _egid,
                       uint64_t _pid, uint64_t _ppid);

src/python/m5/objects/Process.py

@@ -12,6 +12,7 @@ class LiveProcess(Process):
     executable = Param.String('', "executable (overrides cmd[0] if set)")
     cmd = VectorParam.String("command line (executable plus arguments)")
     env = VectorParam.String('', "environment settings")
+    cwd = Param.String('', "current working directory")
     input = Param.String('cin', "filename for stdin")
     uid = Param.Int(100, 'user id')
     euid = Param.Int(100, 'effective user id')

src/sim/process.cc

@@ -314,11 +314,12 @@ LiveProcess::LiveProcess(const string &nm, ObjectFile *_objFile,
                          System *_system,
                          int stdin_fd, int stdout_fd, int stderr_fd,
                          vector<string> &_argv, vector<string> &_envp,
+                         const string &_cwd,
                          uint64_t _uid, uint64_t _euid,
                          uint64_t _gid, uint64_t _egid,
                          uint64_t _pid, uint64_t _ppid)
     : Process(nm, _system, stdin_fd, stdout_fd, stderr_fd),
-      objFile(_objFile), argv(_argv), envp(_envp)
+      objFile(_objFile), argv(_argv), envp(_envp), cwd(_cwd)
 {
     __uid = _uid;
     __euid = _euid;
@@ -427,6 +428,7 @@ LiveProcess::create(const std::string &nm, System *system, int stdin_fd,
                     int stdout_fd, int stderr_fd, std::string executable,
                     std::vector<std::string> &argv,
                     std::vector<std::string> &envp,
+                    const std::string &cwd,
                     uint64_t _uid, uint64_t _euid,
                     uint64_t _gid, uint64_t _egid,
                     uint64_t _pid, uint64_t _ppid)
@@ -445,14 +447,14 @@ LiveProcess::create(const std::string &nm, System *system, int stdin_fd,
       case ObjectFile::Tru64:
         process = new AlphaTru64Process(nm, objFile, system,
                                         stdin_fd, stdout_fd, stderr_fd,
-                                        argv, envp,
+                                        argv, envp, cwd,
                                         _uid, _euid, _gid, _egid, _pid, _ppid);
         break;
 
       case ObjectFile::Linux:
         process = new AlphaLinuxProcess(nm, objFile, system,
                                         stdin_fd, stdout_fd, stderr_fd,
-                                        argv, envp,
+                                        argv, envp, cwd,
                                         _uid, _euid, _gid, _egid, _pid, _ppid);
         break;
 
@@ -466,7 +468,7 @@ LiveProcess::create(const std::string &nm, System *system, int stdin_fd,
       case ObjectFile::Linux:
         process = new SparcLinuxProcess(nm, objFile, system,
                                         stdin_fd, stdout_fd, stderr_fd,
-                                        argv, envp,
+                                        argv, envp, cwd,
                                         _uid, _euid, _gid, _egid, _pid, _ppid);
         break;
 
@@ -474,7 +476,7 @@ LiveProcess::create(const std::string &nm, System *system, int stdin_fd,
       case ObjectFile::Solaris:
         process = new SparcSolarisProcess(nm, objFile, system,
                                         stdin_fd, stdout_fd, stderr_fd,
-                                        argv, envp,
+                                        argv, envp, cwd,
                                         _uid, _euid, _gid, _egid, _pid, _ppid);
         break;
       default:
@@ -487,7 +489,7 @@ LiveProcess::create(const std::string &nm, System *system, int stdin_fd,
       case ObjectFile::Linux:
         process = new MipsLinuxProcess(nm, objFile, system,
                                         stdin_fd, stdout_fd, stderr_fd,
-                                        argv, envp,
+                                        argv, envp, cwd,
                                         _uid, _euid, _gid, _egid, _pid, _ppid);
         break;
 
@@ -512,6 +514,7 @@ BEGIN_DECLARE_SIM_OBJECT_PARAMS(LiveProcess)
     Param<string> input;
     Param<string> output;
     VectorParam<string> env;
+    Param<string> cwd;
     SimObjectParam<System *> system;
     Param<uint64_t> uid;
     Param<uint64_t> euid;
@@ -530,6 +533,7 @@ BEGIN_INIT_SIM_OBJECT_PARAMS(LiveProcess)
     INIT_PARAM(input, "filename for stdin (dflt: use sim stdin)"),
     INIT_PARAM(output, "filename for stdout/stderr (dflt: use sim stdout)"),
     INIT_PARAM(env, "environment settings"),
+    INIT_PARAM(cwd, "current working directory"),
     INIT_PARAM(system, "system"),
     INIT_PARAM(uid, "user id"),
     INIT_PARAM(euid, "effective user id"),
@@ -566,7 +570,7 @@ CREATE_SIM_OBJECT(LiveProcess)
     return LiveProcess::create(getInstanceName(), system,
                                stdin_fd, stdout_fd, stderr_fd,
                                (string)executable == "" ? cmd[0] : executable,
-                               cmd, env,
+                               cmd, env, cwd,
                                uid, euid, gid, egid, pid, ppid);
 }
 

src/sim/process.hh

@@ -177,11 +177,13 @@ class LiveProcess : public Process
     ObjectFile *objFile;
     std::vector<std::string> argv;
     std::vector<std::string> envp;
+    std::string cwd;
 
     LiveProcess(const std::string &nm, ObjectFile *objFile,
                 System *_system, int stdin_fd, int stdout_fd, int stderr_fd,
                 std::vector<std::string> &argv,
                 std::vector<std::string> &envp,
+                const std::string &cwd,
                 uint64_t _uid, uint64_t _euid,
                 uint64_t _gid, uint64_t _egid,
                 uint64_t _pid, uint64_t _ppid);
@@ -207,6 +209,20 @@ class LiveProcess : public Process
     inline uint64_t pid() {return __pid;}
     inline uint64_t ppid() {return __ppid;}
 
+    std::string
+    fullPath(const std::string &filename)
+    {
+        if (filename[0] == '/' || cwd.empty())
+            return filename;
+
+        std::string full = cwd;
+
+        if (cwd[cwd.size() - 1] != '/')
+            full += '/';
+
+        return full + filename;
+    }
+
     virtual void syscall(int64_t callnum, ThreadContext *tc);
 
     virtual SyscallDesc* getDesc(int callnum) = 0;
@@ -220,6 +236,7 @@ class LiveProcess : public Process
                                std::string executable,
                                std::vector<std::string> &argv,
                                std::vector<std::string> &envp,
+                               const std::string &cwd,
                                uint64_t _uid, uint64_t _euid,
                                uint64_t _gid, uint64_t _egid,
                                uint64_t _pid, uint64_t _ppid);

src/sim/syscall_emul.cc

@@ -214,6 +214,9 @@ unlinkFunc(SyscallDesc *desc, int num, LiveProcess *p, ThreadContext *tc)
     if (!tc->getMemPort()->tryReadString(path, tc->getSyscallArg(0)))
         return (TheISA::IntReg)-EFAULT;
 
+    // Adjust path for current working directory
+    path = p->fullPath(path);
+
     int result = unlink(path.c_str());
     return (result == -1) ? -errno : result;
 }
@@ -231,6 +234,10 @@ renameFunc(SyscallDesc *desc, int num, LiveProcess *p, ThreadContext *tc)
     if (!tc->getMemPort()->tryReadString(new_name, tc->getSyscallArg(1)))
         return -EFAULT;
 
+    // Adjust path for current working directory
+    old_name = p->fullPath(old_name);
+    new_name = p->fullPath(new_name);
+
     int64_t result = rename(old_name.c_str(), new_name.c_str());
     return (result == -1) ? -errno : result;
 }
@@ -245,6 +252,9 @@ truncateFunc(SyscallDesc *desc, int num, LiveProcess *p, ThreadContext *tc)
 
     off_t length = tc->getSyscallArg(1);
 
+    // Adjust path for current working directory
+    path = p->fullPath(path);
+
     int result = truncate(path.c_str(), length);
     return (result == -1) ? -errno : result;
 }
@@ -277,6 +287,9 @@ chownFunc(SyscallDesc *desc, int num, LiveProcess *p, ThreadContext *tc)
     uint32_t group = tc->getSyscallArg(2);
     gid_t hostGroup = group;
 
+    // Adjust path for current working directory
+    path = p->fullPath(path);
+
     int result = chown(path.c_str(), hostOwner, hostGroup);
     return (result == -1) ? -errno : result;
 }

src/sim/syscall_emul.hh

@@ -500,6 +500,9 @@ openFunc(SyscallDesc *desc, int callnum, LiveProcess *process,
     hostFlags |= O_BINARY;
 #endif
 
+    // Adjust path for current working directory
+    path = process->fullPath(path);
+
     DPRINTF(SyscallVerbose, "opening file %s\n", path.c_str());
 
     // open the file
@@ -526,6 +529,9 @@ chmodFunc(SyscallDesc *desc, int callnum, LiveProcess *process,
     // XXX translate mode flags via OS::something???
     hostMode = mode;
 
+    // Adjust path for current working directory
+    path = process->fullPath(path);
+
     // do the chmod
     int result = chmod(path.c_str(), hostMode);
     if (result < 0)
@@ -573,6 +579,9 @@ statFunc(SyscallDesc *desc, int callnum, LiveProcess *process,
     if (!tc->getMemPort()->tryReadString(path, tc->getSyscallArg(0)))
     return -EFAULT;
 
+    // Adjust path for current working directory
+    path = process->fullPath(path);
+
     struct stat hostBuf;
     int result = stat(path.c_str(), &hostBuf);
 
@@ -626,6 +635,9 @@ lstatFunc(SyscallDesc *desc, int callnum, LiveProcess *process,
     if (!tc->getMemPort()->tryReadString(path, tc->getSyscallArg(0)))
       return -EFAULT;
 
+    // Adjust path for current working directory
+    path = process->fullPath(path);
+
     struct stat hostBuf;
     int result = lstat(path.c_str(), &hostBuf);
 
@@ -648,6 +660,9 @@ lstat64Func(SyscallDesc *desc, int callnum, LiveProcess *process,
     if (!tc->getMemPort()->tryReadString(path, tc->getSyscallArg(0)))
       return -EFAULT;
 
+    // Adjust path for current working directory
+    path = process->fullPath(path);
+
 #if NO_STAT64
     struct stat hostBuf;
     int result = lstat(path.c_str(), &hostBuf);
@@ -701,6 +716,9 @@ statfsFunc(SyscallDesc *desc, int callnum, LiveProcess *process,
     if (!tc->getMemPort()->tryReadString(path, tc->getSyscallArg(0)))
       return -EFAULT;
 
+    // Adjust path for current working directory
+    path = process->fullPath(path);
+
     struct statfs hostBuf;
     int result = statfs(path.c_str(), &hostBuf);
 
@@ -896,6 +914,10 @@ utimesFunc(SyscallDesc *desc, int callnum, LiveProcess *process,
         hostTimeval[i].tv_sec = gtoh((*tp)[i].tv_sec);
         hostTimeval[i].tv_usec = gtoh((*tp)[i].tv_usec);
     }
+
+    // Adjust path for current working directory
+    path = process->fullPath(path);
+
     int result = utimes(path.c_str(), hostTimeval);
 
     if (result < 0)