Skip site navigation (1)Skip section navigation (2) 
Date:      Sun, 24 May 2015 15:00:28 +0000 (UTC)
From:      Dmitry Chagin <dchagin@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r283390 - head/sys/compat/linux
Message-ID:  <201505241500.t4OF0Sxp035959@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: dchagin
Date: Sun May 24 15:00:27 2015
New Revision: 283390
URL: https://svnweb.freebsd.org/changeset/base/283390

Log:
  Add a function for converting wait options.
  
  Differential Revision:	https://reviews.freebsd.org/D1045
  Reviewed by:	trasz

Modified:
  head/sys/compat/linux/linux_misc.c
  head/sys/compat/linux/linux_misc.h

Modified: head/sys/compat/linux/linux_misc.c
==============================================================================
--- head/sys/compat/linux/linux_misc.c	Sun May 24 14:58:30 2015	(r283389)
+++ head/sys/compat/linux/linux_misc.c	Sun May 24 15:00:27 2015	(r283390)
@@ -2008,3 +2008,22 @@ linux_tdfind(struct thread *td, lwpid_t 
 
 	return (tdt);
 }
+
+void
+linux_to_bsd_waitopts(int options, int *bsdopts)
+{
+
+	if (options & LINUX_WNOHANG)
+		*bsdopts |= WNOHANG;
+	if (options & LINUX_WUNTRACED)
+		*bsdopts |= WUNTRACED;
+	if (options & LINUX_WEXITED)
+		*bsdopts |= WEXITED;
+	if (options & LINUX_WCONTINUED)
+		*bsdopts |= WCONTINUED;
+	if (options & LINUX_WNOWAIT)
+		*bsdopts |= WNOWAIT;
+
+	if (options & __WCLONE)
+		*bsdopts |= WLINUXCLONE;
+}

Modified: head/sys/compat/linux/linux_misc.h
==============================================================================
--- head/sys/compat/linux/linux_misc.h	Sun May 24 14:58:30 2015	(r283389)
+++ head/sys/compat/linux/linux_misc.h	Sun May 24 15:00:27 2015	(r283390)
@@ -113,10 +113,21 @@ struct l_new_utsname {
 
 extern int stclohz;
 
-#define __WCLONE 0x80000000
+#define	LINUX_WNOHANG		0x00000001
+#define	LINUX_WUNTRACED		0x00000002
+#define	LINUX_WSTOPPED		LINUX_WUNTRACED
+#define	LINUX_WEXITED		0x00000004
+#define	LINUX_WCONTINUED	0x00000008
+#define	LINUX_WNOWAIT		0x01000000
+
+
+#define	__WNOTHREAD		0x20000000
+#define	__WALL			0x40000000
+#define	__WCLONE		0x80000000
 
 int linux_common_wait(struct thread *td, int pid, int *status,
 			int options, struct rusage *ru);
+void linux_to_bsd_waitopts(int options, int *bsdopts);
 int linux_set_upcall_kse(struct thread *td, register_t stack);
 int linux_set_cloned_tls(struct thread *td, void *desc);
 struct thread	*linux_tdfind(struct thread *, lwpid_t, pid_t);

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201505241500.t4OF0Sxp035959>