FreeBSD13 can simply work.

2021-09-18 14:50:06 +08:00 · 2021-09-18 14:50:06 +08:00 · 8fe2bf87f3
parent 63f0426fdf
commit 8fe2bf87f3
10 changed files with 10 additions and 8 deletions
--- a/freebsd/sys/resourcevar.h
+++ b/freebsd/sys/resourcevar.h
@ -129,6 +129,7 @@ struct plimit
 	*lim_alloc(void);
 void	 lim_copy(struct plimit *dst, struct plimit *src);
 rlim_t	 lim_cur(struct thread *td, int which);
+#ifndef FSTACK
 #define lim_cur(td, which)	({					\
 	rlim_t _rlim;							\
 	struct thread *_td = (td);					\
@ -141,6 +142,7 @@ rlim_t	 lim_cur(struct thread *td, int which);
 	}								\
 	_rlim;								\
 })
+#endif

 rlim_t	 lim_cur_proc(struct proc *p, int which);
 void	 lim_fork(struct proc *p1, struct proc *p2);
--- a/lib/Makefile
+++ b/lib/Makefile
@ -191,6 +191,7 @@ FF_SRCS+=                     \
 	ff_kern_subr.c        \
 	ff_kern_synch.c       \
 	ff_kern_timeout.c     \
+	ff_subr_epoch.c       \
 	ff_lock.c             \
 	ff_syscall_wrapper.c  \
 	ff_subr_prf.c         \
@ -280,7 +281,6 @@ KERN_SRCS+=                 \
 	subr_taskqueue.c    \
 	subr_unit.c         \
 	subr_smr.c          \
-	subr_epoch.c        \
 	sys_capability.c    \
 	sys_generic.c       \
 	sys_socket.c        \
--- a/lib/ff_glue.c
+++ b/lib/ff_glue.c
@ -753,7 +753,6 @@ lim_hold(struct plimit *limp)
    return (limp);
 }

-#if 0
 /*
 * Return the current (soft) limit for a particular system resource.
 * The which parameter which specifies the index into the rlimit array
@ -766,7 +765,6 @@ lim_cur(struct thread *td, int which)
    lim_rlimit(td, which, &rl);
    return (rl.rlim_cur);
 }
-#endif

 rlim_t
 lim_cur_proc(struct proc *p, int which)
--- a/lib/include/amd64/include/counter.h
+++ b/lib/include/amd64/include/counter.h
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 THL A29 Limited, a Tencent company.
+ * Copyright (C) 2021 THL A29 Limited, a Tencent company.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/lib/include/amd64/include/pcpu.h
+++ b/lib/include/amd64/include/pcpu.h
@ -1,6 +1,6 @@
 /*
 * Copyright (c) 2010 Kip Macy All rights reserved.
- * Copyright (C) 2017 THL A29 Limited, a Tencent company.
+ * Copyright (C) 2021 THL A29 Limited, a Tencent company.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/lib/include/sys/mutex.h
+++ b/lib/include/sys/mutex.h
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 THL A29 Limited, a Tencent company.
+ * Copyright (C) 2021 THL A29 Limited, a Tencent company.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/lib/include/sys/sx.h
+++ b/lib/include/sys/sx.h
@ -3,6 +3,7 @@
 *
 * Copyright (c) 2007 Attilio Rao <attilio@freebsd.org>
 * Copyright (c) 2001 Jason Evans <jasone@freebsd.org>
+ * Copyright (C) 2021 THL A29 Limited, a Tencent company.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/lib/include/sys/turnstile.h
+++ b/lib/include/sys/turnstile.h
@ -1,6 +1,7 @@
 /*
 * Copyright (c) 2010 Kip Macy All rights reserved.
 * Copyright (C) 2017 THL A29 Limited, a Tencent company.
+ * Copyright (C) 2021 THL A29 Limited, a Tencent company.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/lib/include/sys/vnode.h
+++ b/lib/include/sys/vnode.h
@ -1,6 +1,6 @@
 /*
 * Copyright (c) 2010 Kip Macy All rights reserved.
- * Copyright (C) 2017 THL A29 Limited, a Tencent company.
+ * Copyright (C) 2021 THL A29 Limited, a Tencent company.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/lib/include/vm/uma_int.h
+++ b/lib/include/vm/uma_int.h
@ -1,6 +1,6 @@
 /*
 * Copyright (c) 2010 Kip Macy All rights reserved.
- * Copyright (C) 2017 THL A29 Limited, a Tencent company.
+ * Copyright (C) 2021 THL A29 Limited, a Tencent company.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without