import java.io.*;
import java.util.*;
+// FEATURE: vfork
+
public abstract class UnixRuntime extends Runtime implements Cloneable {
/** The pid of this "process" */
private int pid;
// FEATURE: Do the proper mangling for non-unix hosts
String userdir = getSystemProperty("user.dir");
- cwd = userdir != null && userdir.startsWith("/") && File.separatorChar == '/' ? userdir.substring(1) : "";
+ cwd =
+ userdir != null && userdir.startsWith("/") && File.separatorChar == '/' && getSystemProperty("nestedvm.root") == null
+ ? userdir.substring(1) : "";
}
// NOTE: getDisplayName() is a Java2 function
}
String[] createEnv(String[] extra) {
- String[] defaults = new String[5];
+ String[] defaults = new String[6];
int n=0;
if(extra == null) extra = new String[0];
if(!envHas("USER",extra) && getSystemProperty("user.name") != null)
defaults[n++] = "USER=" + getSystemProperty("user.name");
- if(!envHas("HOME",extra) && getSystemProperty("user.name") != null)
+ if(!envHas("HOME",extra) && getSystemProperty("user.home") != null)
defaults[n++] = "HOME=" + getSystemProperty("user.home");
if(!envHas("SHELL",extra)) defaults[n++] = "SHELL=/bin/sh";
if(!envHas("TERM",extra)) defaults[n++] = "TERM=vt100";
if(!envHas("TZ",extra)) defaults[n++] = "TZ=" + posixTZ();
+ if(!envHas("PATH",extra)) defaults[n++] = "PATH=/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin";
String[] env = new String[extra.length+n];
for(int i=0;i<n;i++) env[i] = defaults[i];
for(int i=0;i<extra.length;i++) env[n++] = extra[i];
UnixRuntime[] tasks = gs.tasks;
synchronized(gs) {
if(pid != 0) {
- if(tasks[pid] == null || tasks[pid].pid != pid) throw new Error("should never happen");
+ UnixRuntime prev = tasks[pid];
+ if(prev == null || prev == this || prev.pid != pid || prev.parent != parent)
+ throw new Error("should never happen");
+ synchronized(parent.children) {
+ int i = parent.activeChildren.indexOf(prev);
+ if(i == -1) throw new Error("should never happen");
+ parent.activeChildren.set(i,this);
+ }
} else {
int newpid = -1;
int nextPID = gs.nextPID;
- for(int i=nextPID;i<tasks.length;i++) if(tasks[i] == null) { newpid = i; break; }
- if(newpid == -1) for(int i=1;i<nextPID;i++) if(tasks[i] == null) { newpid = i; break; }
- if(newpid == -1) throw new ProcessTableFullExn();
- pid = newpid;
+ for(int i=nextPID;i<tasks.length;i++) if(tasks[i] == null) { newpid = i; break; }
+ if(newpid == -1) for(int i=1;i<nextPID;i++) if(tasks[i] == null) { newpid = i; break; }
+ if(newpid == -1) throw new ProcessTableFullExn();
+ pid = newpid;
gs.nextPID = newpid + 1;
}
tasks[pid] = this;
case SYS_fork: return sys_fork();
case SYS_pipe: return sys_pipe(a);
case SYS_dup2: return sys_dup2(a,b);
+ case SYS_dup: return sys_dup(a);
case SYS_waitpid: return sys_waitpid(a,b,c);
case SYS_stat: return sys_stat(a,b);
case SYS_lstat: return sys_lstat(a,b);
case SYS_chdir: return sys_chdir(a);
case SYS_exec: return sys_exec(a,b,c);
case SYS_getdents: return sys_getdents(a,b,c,d);
+ case SYS_unlink: return sys_unlink(a);
+ case SYS_getppid: return sys_getppid();
default: return super._syscall(syscall,a,b,c,d);
}
FD _open(String path, int flags, int mode) throws ErrnoException {
return gs.open(this,normalizePath(path),flags,mode);
}
+
+ private int sys_getppid() {
+ return parent == null ? 1 : parent.pid;
+ }
/** The kill syscall.
SIGSTOP, SIGTSTO, SIGTTIN, and SIGTTOUT pause the process.
}
} else {
// process group stuff, EINVAL returned above
- throw new Error("should never happen");
+ throw new Error("should never happen");
}
if(done == null) {
if(!blocking) return 0;
if(children != null) synchronized(children) {
for(Enumeration e = exitedChildren.elements(); e.hasMoreElements(); ) {
UnixRuntime child = (UnixRuntime) e.nextElement();
- gs.tasks[child.pid] = null;
+ gs.tasks[child.pid] = null;
}
exitedChildren.clear();
for(Enumeration e = activeChildren.elements(); e.hasMoreElements(); ) {
if(parent == null) {
gs.tasks[pid] = null;
} else {
- parent.activeChildren.remove(this);
+ if(!parent.activeChildren.remove(this)) throw new Error("should never happen _exited: pid: " + pid);
parent.exitedChildren.add(this);
parent.children.notify();
}
}
protected Object clone() throws CloneNotSupportedException {
- UnixRuntime r = (UnixRuntime) super.clone();
+ UnixRuntime r = (UnixRuntime) super.clone();
r.pid = 0;
r.parent = null;
r.children = null;
try {
r._started();
} catch(ProcessTableFullExn e) {
- return -ENOMEM;
+ return -ENOMEM;
}
//System.err.println("fork " + pid + " -> " + r.pid + " tasks[" + r.pid + "] = " + gd.tasks[r.pid]);
public static int runAndExec(UnixRuntime r, String[] argv) { r.start(argv); return executeAndExec(r); }
public static int executeAndExec(UnixRuntime r) {
- for(;;) {
+ for(;;) {
for(;;) {
if(r.execute()) break;
if(STDERR_DIAG) System.err.println("WARNING: Pause requested while executing runAndExec()");
}
private String[] readStringArray(int addr) throws ReadFaultException {
- int count = 0;
+ int count = 0;
for(int p=addr;memRead(p) != 0;p+=4) count++;
String[] a = new String[count];
for(int i=0,p=addr;i<count;i++,p+=4) a[i] = cstring(memRead(p));
}
private int sys_exec(int cpath, int cargv, int cenvp) throws ErrnoException, FaultException {
- return exec(normalizePath(cstring(cpath)),readStringArray(cargv),readStringArray(cenvp));
+ return exec(normalizePath(cstring(cpath)),readStringArray(cargv),readStringArray(cenvp));
}
private int exec(String normalizedPath, String[] argv, String[] envp) throws ErrnoException {
if(argv.length == 0) argv = new String[]{""};
+ // NOTE: For this little hack to work nestedvm.root MUST be "."
+ /*try {
+ System.err.println("Execing normalized path: " + normalizedPath);
+ if(true) return exec(new Interpreter(normalizedPath),argv,envp);
+ } catch(IOException e) { throw new Error(e); }*/
+
Object o = gs.exec(this,normalizedPath);
if(o == null) return -ENOENT;
if(o instanceof Class) {
Class c = (Class) o;
try {
- return exec((UnixRuntime) c.newInstance(),argv,envp);
+ return exec((UnixRuntime) c.newInstance(),argv,envp);
} catch(Exception e) {
- e.printStackTrace();
+ e.printStackTrace();
return -ENOEXEC;
}
} else {
public final FD writer = new Writer();
public class Reader extends FD {
- protected FStat _fstat() { return new FStat(); }
+ protected FStat _fstat() { return new FStat(); }
public int read(byte[] buf, int off, int len) throws ErrnoException {
if(len == 0) return 0;
synchronized(Pipe.this) {
try { Pipe.this.wait(); } catch(InterruptedException e) { /* ignore */ }
}
if(writePos == -1) return 0; // eof
- len = Math.min(len,writePos-readPos);
+ len = Math.min(len,writePos-readPos);
System.arraycopy(pipebuf,readPos,buf,off,len);
readPos += len;
if(readPos == writePos) Pipe.this.notify();
if(readPos == -1) throw new ErrnoException(EPIPE);
if(pipebuf.length - writePos < Math.min(len,PIPE_BUF)) {
// not enough space to atomicly write the data
- while(readPos != -1 && readPos != writePos) {
- try { Pipe.this.wait(); } catch(InterruptedException e) { /* ignore */ }
- }
+ while(readPos != -1 && readPos != writePos) {
+ try { Pipe.this.wait(); } catch(InterruptedException e) { /* ignore */ }
+ }
if(readPos == -1) throw new ErrnoException(EPIPE);
readPos = writePos = 0;
}
return 0;
}
+ private int sys_dup(int oldd) {
+ if(oldd < 0 || oldd >= OPEN_MAX) return -EBADFD;
+ if(fds[oldd] == null) return -EBADFD;
+ FD fd = fds[oldd].dup();
+ int newd = addFD(fd);
+ if(newd < 0) { fd.close(); return -ENFILE; }
+ return newd;
+ }
+
private int sys_stat(int cstring, int addr) throws FaultException, ErrnoException {
FStat s = gs.stat(this,normalizePath(cstring(cstring)));
if(s == null) return -ENOENT;
return 0;
}
+ private int sys_unlink(int cstring) throws FaultException, ErrnoException {
+ gs.unlink(this,normalizePath(cstring(cstring)));
+ return 0;
+ }
+
private int sys_getcwd(int addr, int size) throws FaultException, ErrnoException {
byte[] b = getBytes(cwd);
if(size == 0) return -EINVAL;
protected static final int STAT = 2;
protected static final int LSTAT = 3;
protected static final int MKDIR = 4;
+ protected static final int UNLINK = 5;
final UnixRuntime[] tasks;
int nextPID = 1;
public GlobalState(int maxProcs, boolean defaultMounts) {
tasks = new UnixRuntime[maxProcs+1];
if(defaultMounts) {
- addMount("/",new HostFS());
+ addMount("/",new HostFS());
addMount("/dev",new DevFS());
}
}
- private static class MP {
+ private static class MP implements Comparable {
public MP(String path, FS fs) { this.path = path; this.fs = fs; }
public String path;
public FS fs;
public synchronized void removeMount(String path) {
if(!path.startsWith("/")) throw new IllegalArgumentException("Mount point doesn't start with a /");
if(path.equals("/")) {
- removeMount(-1);
+ removeMount(-1);
} else {
path = path.substring(1);
int p;
for(p=0;p<mps.length;p++) if(mps[p].path.equals(path)) break;
if(p == mps.length) throw new IllegalArgumentException("mount point doesn't exist");
- removeMount(p);
+ removeMount(p);
}
}
private Object fsop(int op, UnixRuntime r, String normalizedPath, int arg1, int arg2) throws ErrnoException {
int pl = normalizedPath.length();
if(pl != 0) {
- MP[] list;
+ MP[] list;
synchronized(this) { list = mps; }
for(int i=0;i<list.length;i++) {
- MP mp = list[i];
- int mpl = mp.path.length();
+ MP mp = list[i];
+ int mpl = mp.path.length();
if(normalizedPath.startsWith(mp.path) && (pl == mpl || (pl < mpl && normalizedPath.charAt(mpl) == '/')))
- return dispatch(mp.fs,op,r,pl == mpl ? "" : normalizedPath.substring(mpl+1),arg1,arg2);
+ return dispatch(mp.fs,op,r,pl == mpl ? "" : normalizedPath.substring(mpl+1),arg1,arg2);
}
}
return dispatch(root,op,r,normalizedPath,arg1,arg2);
private static Object dispatch(FS fs, int op, UnixRuntime r, String path, int arg1, int arg2) throws ErrnoException {
switch(op) {
- case OPEN: return fs.open(r,path,arg1,arg2);
+ case OPEN: return fs.open(r,path,arg1,arg2);
case STAT: return fs.stat(r,path);
case LSTAT: return fs.lstat(r,path);
case MKDIR: fs.mkdir(r,path,arg1); return null;
+ case UNLINK: fs.unlink(r,path); return null;
default: throw new Error("should never happen");
}
}
public final FStat stat(UnixRuntime r, String path) throws ErrnoException { return (FStat) fsop(STAT,r,path,0,0); }
public final FStat lstat(UnixRuntime r, String path) throws ErrnoException { return (FStat) fsop(LSTAT,r,path,0,0); }
public final void mkdir(UnixRuntime r, String path, int mode) throws ErrnoException { fsop(MKDIR,r,path,mode,0); }
+ public final void unlink(UnixRuntime r, String path) throws ErrnoException { fsop(UNLINK,r,path,0,0); }
private Hashtable execCache = new Hashtable();
private static class CacheEnt {
}
public synchronized Object exec(UnixRuntime r, String path) throws ErrnoException {
+ // FIXME: Hideous hack to make a standalone busybox possible
+ if(path.equals("bin/busybox") && Boolean.valueOf(getSystemProperty("nestedvm.busyboxhack")).booleanValue())
+ return r.getClass();
FStat fstat = stat(r,path);
if(fstat == null) return null;
long mtime = fstat.mtime();
CacheEnt ent = (CacheEnt) execCache.get(path);
if(ent != null) {
//System.err.println("Found cached entry for " + path);
- if(ent.time == mtime && ent.size == size) return ent.o;
+ if(ent.time == mtime && ent.size == size) return ent.o;
//System.err.println("Cache was out of date");
execCache.remove(path);
}
break;
case '#':
if(n == 1) {
- int n2 = s.read(buf,1,buf.length-1);
+ int n2 = s.read(buf,1,buf.length-1);
if(n2 == -1) throw new ErrnoException(ENOEXEC);
n += n2;
}
int p = 2;
n -= 2;
OUTER: for(;;) {
- for(int i=p;i<p+n;i++) if(buf[i] == '\n') { p = i; break OUTER; }
+ for(int i=p;i<p+n;i++) if(buf[i] == '\n') { p = i; break OUTER; }
p += n;
if(p == buf.length) break OUTER;
n = s.read(buf,p,buf.length-p);
for(arg=2;arg<p;arg++) if(buf[arg] == ' ') break;
if(arg < p) {
int cmdEnd = arg;
- while(arg < p && buf[arg] == ' ') arg++;
+ while(arg < p && buf[arg] == ' ') arg++;
command[0] = new String(buf,2,cmdEnd);
command[1] = arg < p ? new String(buf,arg,p-arg) : null;
} else {
- command[0] = new String(buf,2,p-2);
+ command[0] = new String(buf,2,p-2);
}
//System.err.println("command[0]: " + command[0] + " command[1]: " + command[1]);
break;
}
} catch(IOException e) {
fd.close();
- throw new ErrnoException(EIO);
+ throw new ErrnoException(EIO);
}
if(command == null) {
// its an elf binary
try {
s.seek(0);
- Class c = RuntimeCompiler.compile(s);
+ Class c = RuntimeCompiler.compile(s);
//System.err.println("Compile succeeded: " + c);
ent = new CacheEnt(mtime,size,c);
} catch(Compiler.Exn e) {
throw new ErrnoException(ENOEXEC);
} catch(IOException e) {
if(STDERR_DIAG) e.printStackTrace();
- throw new ErrnoException(EIO);
+ throw new ErrnoException(EIO);
}
} else {
- ent = new CacheEnt(mtime,size,command);
+ ent = new CacheEnt(mtime,size,command);
}
fd.close();
// If this returns null it'll be turned into an ENOENT
public abstract FStat stat(UnixRuntime r, String path) throws ErrnoException;
public abstract void mkdir(UnixRuntime r, String path, int mode) throws ErrnoException;
+ public abstract void unlink(UnixRuntime r, String path) throws ErrnoException;
}
// FEATURE: chroot support in here
if(absolute) {
do { inp++; } while(in[inp] == '/');
} else if(cwdl != 0) {
- cwd.getChars(0,cwdl,out,0);
- outp = cwdl;
+ cwd.getChars(0,cwdl,out,0);
+ outp = cwdl;
}
path.getChars(0,path.length(),in,0);
while(in[inp] != 0) {
- if(inp != 0) {
- if(in[inp] != '/') { out[outp++] = in[inp++]; continue; }
- while(in[inp] == '/') inp++;
+ if(inp != 0 || cwdl==0) {
+ if(in[inp] != '/') { out[outp++] = in[inp++]; continue; }
+ while(in[inp] == '/') inp++;
}
if(in[inp] == '\0') continue;
if(in[inp] != '.') { out[outp++] = '/'; out[outp++] = in[inp++]; continue; }
public File getRoot() { return root; }
private static File hostRootDir() {
+ if(getSystemProperty("nestedvm.root") != null) {
+ File f = new File(getSystemProperty("nestedvm.root"));
+ if(f.isDirectory()) return f;
+ // fall through to case below
+ }
String cwd = getSystemProperty("user.dir");
File f = new File(cwd != null ? cwd : ".");
+ if(!f.exists()) throw new Error("Couldn't get File for cwd");
f = new File(f.getAbsolutePath());
while(f.getParent() != null) f = new File(f.getParent());
return f;
if(sep != '/') {
char buf[] = path.toCharArray();
for(int i=0;i<buf.length;i++) {
- char c = buf[i];
+ char c = buf[i];
if(c == '/') buf[i] = sep;
else if(c == sep) buf[i] = '/';
}
return r.hostFSOpen(f,flags,mode,this);
}
+ public void unlink(UnixRuntime r, String path) throws ErrnoException {
+ File f = hostFile(path);
+ if(r.sm != null && !r.sm.allowUnlink(f)) throw new ErrnoException(EPERM);
+ if(!f.exists()) throw new ErrnoException(ENOENT);
+ if(!f.delete()) throw new ErrnoException(EPERM);
+ }
+
public FStat stat(UnixRuntime r, String path) throws ErrnoException {
File f = hostFile(path);
if(r.sm != null && !r.sm.allowStat(f)) throw new ErrnoException(EACCES);
int reclen;
OUTER: for(;len > 0 && pos < size();pos++){
switch(pos) {
- case -2:
+ case -2:
case -1:
- ino = pos == -1 ? parentInode() : myInode();
+ ino = pos == -1 ? parentInode() : myInode();
if(ino == -1) continue;
reclen = 9 + (pos == -1 ? 2 : 1);
if(reclen > len) break OUTER;
}
private FD devZeroFD = new FD() {
- public boolean readable() { return true; }
- public boolean writable() { return true; }
public int read(byte[] a, int off, int length) { Arrays.fill(a,off,off+length,(byte)0); return length; }
public int write(byte[] a, int off, int length) { return length; }
public int seek(int n, int whence) { return 0; }
public FStat _fstat() { return new DevFStat(){ public int inode() { return ZERO_INODE; } }; }
};
private FD devNullFD = new FD() {
- public boolean readable() { return true; }
- public boolean writable() { return true; }
public int read(byte[] a, int off, int length) { return 0; }
public int write(byte[] a, int off, int length) { return length; }
public int seek(int n, int whence) { return 0; }
public String name(int n) {
switch(n) {
- case 0: return "null";
+ case 0: return "null";
case 1: return "zero";
case 2: return "fd";
default: return null;
return null;
}
- public void mkdir(UnixRuntime r, String path, int mode) throws ErrnoException { throw new ErrnoException(EACCES); }
- }
+ public void mkdir(UnixRuntime r, String path, int mode) throws ErrnoException { throw new ErrnoException(EROFS); }
+ public void unlink(UnixRuntime r, String path) throws ErrnoException { throw new ErrnoException(EROFS); }
+ }
}