svn commit: r247228 - in user/dchagin/lemul/sys: amd64/linux32 compat/linux i386/linux

[Dmitry Chagin]

Author: dchagin
Date: Sun Feb 24 18:12:30 2013
New Revision: 247228
URL: http://svnweb.freebsd.org/changeset/base/247228

Log:
  Implement rt_sigqueueinfo() system call.

Modified:
  user/dchagin/lemul/sys/amd64/linux32/linux32_dummy.c
  user/dchagin/lemul/sys/amd64/linux32/syscalls.master
  user/dchagin/lemul/sys/compat/linux/linux_signal.c
  user/dchagin/lemul/sys/compat/linux/linux_signal.h
  user/dchagin/lemul/sys/i386/linux/linux_dummy.c
  user/dchagin/lemul/sys/i386/linux/syscalls.master

Modified: user/dchagin/lemul/sys/amd64/linux32/linux32_dummy.c
==============================================================================
--- user/dchagin/lemul/sys/amd64/linux32/linux32_dummy.c	Sun Feb 24 17:20:53 2013	(r247227)
+++ user/dchagin/lemul/sys/amd64/linux32/linux32_dummy.c	Sun Feb 24 18:12:30 2013	(r247228)
@@ -62,7 +62,6 @@ DUMMY(bdflush);
 DUMMY(sysfs);
 DUMMY(query_module);
 DUMMY(nfsservctl);
-DUMMY(rt_sigqueueinfo);
 DUMMY(sendfile);
 DUMMY(setfsuid);
 DUMMY(setfsgid);

Modified: user/dchagin/lemul/sys/amd64/linux32/syscalls.master
==============================================================================
--- user/dchagin/lemul/sys/amd64/linux32/syscalls.master	Sun Feb 24 17:20:53 2013	(r247227)
+++ user/dchagin/lemul/sys/amd64/linux32/syscalls.master	Sun Feb 24 18:12:30 2013	(r247228)
@@ -318,7 +318,8 @@
 				    l_siginfo_t *ptr, \
 				    struct l_timeval *timeout, \
 				    l_size_t sigsetsize); }
-178	AUE_NULL	STD	{ int linux_rt_sigqueueinfo(void); }
+178	AUE_NULL	STD	{ int linux_rt_sigqueueinfo(l_pid_t pid, l_int sig, \
+				    l_siginfo_t *info); }
 179	AUE_NULL	STD	{ int linux_rt_sigsuspend( \
 				    l_sigset_t *newset, \
 				    l_size_t sigsetsize); }

Modified: user/dchagin/lemul/sys/compat/linux/linux_signal.c
==============================================================================
--- user/dchagin/lemul/sys/compat/linux/linux_signal.c	Sun Feb 24 17:20:53 2013	(r247227)
+++ user/dchagin/lemul/sys/compat/linux/linux_signal.c	Sun Feb 24 18:12:30 2013	(r247228)
@@ -681,3 +681,50 @@ siginfo_to_lsiginfo(siginfo_t *si, l_sig
 		lsi->lsi_ptr = PTROUT(si->si_value.sival_ptr);
 	}
 }
+
+void
+lsiginfo_to_ksiginfo(l_siginfo_t *lsi, ksiginfo_t *ksi, int sig)
+{
+
+	ksi->ksi_signo = sig;
+	ksi->ksi_code = lsi->lsi_code;
+	ksi->ksi_pid = lsi->lsi_pid;
+	ksi->ksi_uid = lsi->lsi_uid;
+	ksi->ksi_status = lsi->lsi_status;
+	ksi->ksi_addr = PTRIN(lsi->lsi_addr);
+	ksi->ksi_info.si_value.sival_int = lsi->lsi_int;
+}
+
+int
+linux_rt_sigqueueinfo(struct thread *td, struct linux_rt_sigqueueinfo_args *args)
+{
+	l_siginfo_t linfo;
+	struct proc *p;
+	ksiginfo_t ksi;
+	int error;
+	int sig;
+
+	if (!LINUX_SIG_VALID(args->sig))
+		return (EINVAL);
+
+	if ((error = copyin(args->info, &linfo, sizeof(linfo))))
+		return (error);
+
+	if (linfo.lsi_code >= 0)
+		return (EPERM);
+
+	if (args->sig > 0 && args->sig <= LINUX_SIGTBLSZ)
+		sig = linux_to_bsd_signal[_SIG_IDX(args->sig)];
+	else
+		sig = args->sig;
+
+	error = ESRCH;
+	if ((p = pfind(args->pid)) != NULL ||
+	    (p = zpfind(args->pid)) != NULL) {
+		ksiginfo_init(&ksi);
+		lsiginfo_to_ksiginfo(&linfo, &ksi, sig);
+		error = tdsendsignal(p, NULL, sig, &ksi);
+		PROC_UNLOCK(p);
+	}
+	return (error);
+}

Modified: user/dchagin/lemul/sys/compat/linux/linux_signal.h
==============================================================================
--- user/dchagin/lemul/sys/compat/linux/linux_signal.h	Sun Feb 24 17:20:53 2013	(r247227)
+++ user/dchagin/lemul/sys/compat/linux/linux_signal.h	Sun Feb 24 18:12:30 2013	(r247228)
@@ -39,6 +39,7 @@ extern int linux_to_bsd_signal[];
 void linux_to_bsd_sigset(l_sigset_t *, sigset_t *);
 void bsd_to_linux_sigset(sigset_t *, l_sigset_t *);
 int linux_do_sigaction(struct thread *, int, l_sigaction_t *, l_sigaction_t *);
+void lsiginfo_to_ksiginfo(l_siginfo_t *lsi, ksiginfo_t *ksi, int sig);
 void ksiginfo_to_lsiginfo(ksiginfo_t *ksi, l_siginfo_t *lsi, l_int sig);
 void siginfo_to_lsiginfo(siginfo_t *si, l_siginfo_t *lsi, l_int sig);
 

Modified: user/dchagin/lemul/sys/i386/linux/linux_dummy.c
==============================================================================
--- user/dchagin/lemul/sys/i386/linux/linux_dummy.c	Sun Feb 24 17:20:53 2013	(r247227)
+++ user/dchagin/lemul/sys/i386/linux/linux_dummy.c	Sun Feb 24 18:12:30 2013	(r247228)
@@ -65,7 +65,6 @@ DUMMY(sysfs);
 DUMMY(vm86);
 DUMMY(query_module);
 DUMMY(nfsservctl);
-DUMMY(rt_sigqueueinfo);
 DUMMY(sendfile);		/* different semantics */
 DUMMY(setfsuid);
 DUMMY(setfsgid);

Modified: user/dchagin/lemul/sys/i386/linux/syscalls.master
==============================================================================
--- user/dchagin/lemul/sys/i386/linux/syscalls.master	Sun Feb 24 17:20:53 2013	(r247227)
+++ user/dchagin/lemul/sys/i386/linux/syscalls.master	Sun Feb 24 18:12:30 2013	(r247228)
@@ -320,7 +320,8 @@
 				    l_siginfo_t *ptr, \
 				    struct l_timeval *timeout, \
 				    l_size_t sigsetsize); }
-178	AUE_NULL	STD	{ int linux_rt_sigqueueinfo(void); }
+178	AUE_NULL	STD	{ int linux_rt_sigqueueinfo(l_pid_t pid, l_int sig, \
+				    l_siginfo_t *info); }
 179	AUE_NULL	STD	{ int linux_rt_sigsuspend( \
 				    l_sigset_t *newset, \
 				    l_size_t sigsetsize); }