diff options
author | jeff <jeff@FreeBSD.org> | 2008-03-12 10:12:01 +0000 |
---|---|---|
committer | jeff <jeff@FreeBSD.org> | 2008-03-12 10:12:01 +0000 |
commit | acb93d599cf9e4c7fc183f5568b740813472ff16 (patch) | |
tree | c3fbc6ec97828161d5fc648204b80efb7998da35 /sys/fs | |
parent | 72babed2a5bcb10d29075f3c1495c9aca3e0af60 (diff) | |
download | FreeBSD-src-acb93d599cf9e4c7fc183f5568b740813472ff16.zip FreeBSD-src-acb93d599cf9e4c7fc183f5568b740813472ff16.tar.gz |
Remove kernel support for M:N threading.
While the KSE project was quite successful in bringing threading to
FreeBSD, the M:N approach taken by the kse library was never developed
to its full potential. Backwards compatibility will be provided via
libmap.conf for dynamically linked binaries and static binaries will
be broken.
Diffstat (limited to 'sys/fs')
-rw-r--r-- | sys/fs/fifofs/fifo_vnops.c | 2 | ||||
-rw-r--r-- | sys/fs/procfs/procfs_ctl.c | 7 | ||||
-rw-r--r-- | sys/fs/procfs/procfs_dbregs.c | 1 | ||||
-rw-r--r-- | sys/fs/procfs/procfs_status.c | 21 |
4 files changed, 10 insertions, 21 deletions
diff --git a/sys/fs/fifofs/fifo_vnops.c b/sys/fs/fifofs/fifo_vnops.c index 10266b7..051b59b 100644 --- a/sys/fs/fifofs/fifo_vnops.c +++ b/sys/fs/fifofs/fifo_vnops.c @@ -43,7 +43,7 @@ #include <sys/mutex.h> #include <sys/malloc.h> #include <sys/poll.h> -#include <sys/proc.h> /* XXXKSE */ +#include <sys/proc.h> #include <sys/signalvar.h> #include <sys/socket.h> #include <sys/socketvar.h> diff --git a/sys/fs/procfs/procfs_ctl.c b/sys/fs/procfs/procfs_ctl.c index 89aa304..ca227e8 100644 --- a/sys/fs/procfs/procfs_ctl.c +++ b/sys/fs/procfs/procfs_ctl.c @@ -189,7 +189,7 @@ out: /* * do single-step fixup if needed */ - FIX_SSTEP(FIRST_THREAD_IN_PROC(p)); /* XXXKSE */ + FIX_SSTEP(FIRST_THREAD_IN_PROC(p)); #endif /* @@ -245,7 +245,7 @@ out: * What does it mean to single step a threaded program? */ case PROCFS_CTL_STEP: - error = proc_sstep(FIRST_THREAD_IN_PROC(p)); /* XXXKSE */ + error = proc_sstep(FIRST_THREAD_IN_PROC(p)); PROC_UNLOCK(p); if (error) return (error); @@ -335,14 +335,11 @@ procfs_doprocctl(PFS_FILL_ARGS) printf("procfs: got a sig%s\n", sbuf_data(sb)); PROC_LOCK(p); - /* This is very broken XXXKSE: */ if (TRACE_WAIT_P(td->td_proc, p)) { p->p_xstat = nm->nm_val; #ifdef FIX_SSTEP - /* XXXKSE: */ FIX_SSTEP(FIRST_THREAD_IN_PROC(p)); #endif - /* XXXKSE: */ p->p_flag &= ~P_STOPPED_SIG; PROC_SLOCK(p); thread_unsuspend(p); diff --git a/sys/fs/procfs/procfs_dbregs.c b/sys/fs/procfs/procfs_dbregs.c index d985245..722e4cf 100644 --- a/sys/fs/procfs/procfs_dbregs.c +++ b/sys/fs/procfs/procfs_dbregs.c @@ -105,7 +105,6 @@ procfs_doprocdbregs(PFS_FILL_ARGS) return (EPERM); } - /* XXXKSE: */ td2 = FIRST_THREAD_IN_PROC(p); #ifdef COMPAT_IA32 if (td->td_proc->p_sysent == &ia32_freebsd_sysvec) { diff --git a/sys/fs/procfs/procfs_status.c b/sys/fs/procfs/procfs_status.c index 871d7fc..a1eefb4 100644 --- a/sys/fs/procfs/procfs_status.c +++ b/sys/fs/procfs/procfs_status.c @@ -112,20 +112,13 @@ procfs_doprocstatus(PFS_FILL_ARGS) sbuf_printf(sb, "noflags"); } -#ifdef KSE - if (p->p_flag & P_SA) - wmesg = "-kse- "; - else -#endif - { - tdfirst = FIRST_THREAD_IN_PROC(p); - if (tdfirst->td_wchan != NULL) { - KASSERT(tdfirst->td_wmesg != NULL, - ("wchan %p has no wmesg", tdfirst->td_wchan)); - wmesg = tdfirst->td_wmesg; - } else - wmesg = "nochan"; - } + tdfirst = FIRST_THREAD_IN_PROC(p); + if (tdfirst->td_wchan != NULL) { + KASSERT(tdfirst->td_wmesg != NULL, + ("wchan %p has no wmesg", tdfirst->td_wchan)); + wmesg = tdfirst->td_wmesg; + } else + wmesg = "nochan"; if (p->p_flag & P_INMEM) { struct timeval start, ut, st; |