svn commit: r247175 - in user/dchagin/lemul/sys: amd64/linux32 compat/linux kern sys

[Dmitry Chagin]

Author: dchagin
Date: Sat Feb 23 08:59:07 2013
New Revision: 247175
URL: http://svnweb.freebsd.org/changeset/base/247175

Log:
      In preparation for switching linuxulator to the use the native 1:1 threads
      refactor kern_sched_rr_get_interval() and sys_sched_rr_get_interval().
      kern_sched_rr_get_interval() now takes a targettd parameter to allow specify
      target thread directly by callee (new Linuxulator).
  
      Linuxulator temporarily uses first thread in proc.
  
      Move linux_sched_rr_get_interval() to the MI part.
  
      While here rename e to a better name - error.

Modified:
  user/dchagin/lemul/sys/amd64/linux32/linux32_machdep.c
  user/dchagin/lemul/sys/compat/linux/linux_misc.c
  user/dchagin/lemul/sys/kern/p1003_1b.c
  user/dchagin/lemul/sys/sys/syscallsubr.h

Modified: user/dchagin/lemul/sys/amd64/linux32/linux32_machdep.c
==============================================================================
--- user/dchagin/lemul/sys/amd64/linux32/linux32_machdep.c	Sat Feb 23 08:57:47 2013	(r247174)
+++ user/dchagin/lemul/sys/amd64/linux32/linux32_machdep.c	Sat Feb 23 08:59:07 2013	(r247175)
@@ -914,22 +914,6 @@ linux_getrusage(struct thread *td, struc
 }
 
 int
-linux_sched_rr_get_interval(struct thread *td,
-    struct linux_sched_rr_get_interval_args *uap)
-{
-	struct timespec ts;
-	struct l_timespec ts32;
-	int error;
-
-	error = kern_sched_rr_get_interval(td, uap->pid, &ts);
-	if (error != 0)
-		return (error);
-	ts32.tv_sec = ts.tv_sec;
-	ts32.tv_nsec = ts.tv_nsec;
-	return (copyout(&ts32, uap->interval, sizeof(ts32)));
-}
-
-int
 linux_set_thread_area(struct thread *td,
     struct linux_set_thread_area_args *args)
 {

Modified: user/dchagin/lemul/sys/compat/linux/linux_misc.c
==============================================================================
--- user/dchagin/lemul/sys/compat/linux/linux_misc.c	Sat Feb 23 08:57:47 2013	(r247174)
+++ user/dchagin/lemul/sys/compat/linux/linux_misc.c	Sat Feb 23 08:59:07 2013	(r247175)
@@ -1925,3 +1925,31 @@ linux_sched_setaffinity(struct thread *t
 
 	return (sys_cpuset_setaffinity(td, &csa));
 }
+
+int
+linux_sched_rr_get_interval(struct thread *td,
+    struct linux_sched_rr_get_interval_args *uap)
+{
+	struct timespec ts;
+	struct l_timespec lts;
+	struct thread *tdt;
+	struct proc *p;
+	int error;
+
+	if (uap->pid == 0) {
+		tdt = td;
+		PROC_LOCK(tdt->td_proc);
+	} else {
+		p = pfind(uap->pid);
+		if (p == NULL)
+			return (ESRCH);
+		tdt = FIRST_THREAD_IN_PROC(p);
+	}
+
+	error = kern_sched_rr_get_interval(td, tdt, &ts);
+	if (error != 0)
+		return (error);
+	lts.tv_sec = ts.tv_sec;
+	lts.tv_nsec = ts.tv_nsec;
+	return (copyout(&lts, uap->interval, sizeof(lts)));
+}

Modified: user/dchagin/lemul/sys/kern/p1003_1b.c
==============================================================================
--- user/dchagin/lemul/sys/kern/p1003_1b.c	Sat Feb 23 08:57:47 2013	(r247174)
+++ user/dchagin/lemul/sys/kern/p1003_1b.c	Sat Feb 23 08:59:07 2013	(r247175)
@@ -269,38 +269,42 @@ sys_sched_rr_get_interval(struct thread 
     struct sched_rr_get_interval_args *uap)
 {
 	struct timespec timespec;
+	struct thread *targettd;
+	struct proc *p;
 	int error;
 
-	error = kern_sched_rr_get_interval(td, uap->pid, &timespec);
+	if (uap->pid == 0) {
+		targettd = td;
+		p = td->td_proc;
+		PROC_LOCK(p);
+	} else {
+		p = pfind(uap->pid);
+		if (p == NULL)
+			return (ESRCH);
+		targettd = FIRST_THREAD_IN_PROC(p);
+	}
+
+	error = kern_sched_rr_get_interval(td, targettd, &timespec);
 	if (error == 0)
 		error = copyout(&timespec, uap->interval, sizeof(timespec));
 	return (error);
 }
 
 int
-kern_sched_rr_get_interval(struct thread *td, pid_t pid,
+kern_sched_rr_get_interval(struct thread *td, struct thread *targettd,
     struct timespec *ts)
 {
-	int e;
-	struct thread *targettd;
 	struct proc *targetp;
+	int error;
 
-	if (pid == 0) {
-		targettd = td;
-		targetp = td->td_proc;
-		PROC_LOCK(targetp);
-	} else {
-		targetp = pfind(pid);
-		if (targetp == NULL)
-			return (ESRCH);
-		targettd = FIRST_THREAD_IN_PROC(targetp);
-	}
+	targetp = targettd->td_proc;
+	PROC_LOCK_ASSERT(targetp, MA_OWNED);
 
-	e = p_cansee(td, targetp);
-	if (e == 0)
-		e = ksched_rr_get_interval(ksched, targettd, ts);
+	error = p_cansee(td, targetp);
+	if (error == 0)
+		error = ksched_rr_get_interval(ksched, targettd, ts);
 	PROC_UNLOCK(targetp);
-	return (e);
+	return (error);
 }
 
 #endif

Modified: user/dchagin/lemul/sys/sys/syscallsubr.h
==============================================================================
--- user/dchagin/lemul/sys/sys/syscallsubr.h	Sat Feb 23 08:57:47 2013	(r247174)
+++ user/dchagin/lemul/sys/sys/syscallsubr.h	Sat Feb 23 08:59:07 2013	(r247175)
@@ -180,7 +180,7 @@ int	kern_renameat(struct thread *td, int
 int	kern_rmdir(struct thread *td, char *path, enum uio_seg pathseg);
 int	kern_rmdirat(struct thread *td, int fd, char *path,
 	    enum uio_seg pathseg);
-int	kern_sched_rr_get_interval(struct thread *td, pid_t pid,
+int	kern_sched_rr_get_interval(struct thread *td, struct thread *targettd,
 	    struct timespec *ts);
 int	kern_semctl(struct thread *td, int semid, int semnum, int cmd,
 	    union semun *arg, register_t *rval);