diff options
| author | Dan McDonald <danmcd@mnx.io> | 2022-08-30 14:12:15 -0400 |
|---|---|---|
| committer | Dan McDonald <danmcd@mnx.io> | 2022-08-30 14:12:15 -0400 |
| commit | a0ca4b971f70f58bb46e2997617095d0a282f01c (patch) | |
| tree | 7ba2c8de99e4ce26e641d432aa97dc6bc09cf37e /usr/src/uts/common/os/sched.c | |
| parent | 6fdd4ee4f94e1d85096a40cc353a2c1a79dae14a (diff) | |
| parent | 2570281cf351044b6936651ce26dbe1f801dcbd8 (diff) | |
| download | illumos-joyent-a0ca4b971f70f58bb46e2997617095d0a282f01c.tar.gz | |
[illumos-gate merge]
commit 2570281cf351044b6936651ce26dbe1f801dcbd8
14079 remove TNF
commit 2ec63ffb3ec249bd7cb4523118c8437e6c6be335
14930 getallifaddrs() fails in shared IP zone after 3729
Conflicts:
manifest
Diffstat (limited to 'usr/src/uts/common/os/sched.c')
| -rw-r--r-- | usr/src/uts/common/os/sched.c | 28 |
1 files changed, 2 insertions, 26 deletions
diff --git a/usr/src/uts/common/os/sched.c b/usr/src/uts/common/os/sched.c index 6eb1194af3..a54ab28751 100644 --- a/usr/src/uts/common/os/sched.c +++ b/usr/src/uts/common/os/sched.c @@ -49,7 +49,6 @@ #include <sys/modctl.h> #include <sys/debug.h> #include <sys/sdt.h> -#include <sys/tnf_probe.h> #include <sys/procfs.h> #include <vm/seg.h> @@ -575,11 +574,6 @@ top: /* Kernel probe */ DTRACE_SCHED1(swapin__lwp, kthread_t *, tp); - TNF_PROBE_4(swapin_lwp, "vm swap swapin", /* CSTYLED */, - tnf_pid, pid, pp->p_pid, - tnf_lwpid, lwpid, tp->t_tid, - tnf_kthread_id, tid, tp, - tnf_ulong, page_count, stack_pages); rw_enter(&kas.a_lock, RW_READER); err = segkp_fault(segkp->s_as->a_hat, segkp, @@ -715,14 +709,6 @@ top: /* Kernel probe */ DTRACE_SCHED1(swapout__lwp, kthread_t *, tp); - TNF_PROBE_4(swapout_lwp, - "vm swap swapout", - /* CSTYLED */, - tnf_pid, pid, pp->p_pid, - tnf_lwpid, lwpid, tp->t_tid, - tnf_kthread_id, tid, tp, - tnf_ulong, page_count, - stack_pages); rw_enter(&kas.a_lock, RW_READER); err = segkp_fault(segkp->s_as->a_hat, @@ -771,11 +757,9 @@ top: TRACE_2(TR_FAC_SCHED, TR_SWAPOUT, "swapout: pp %p pages_pushed %lu", pp, ws_pages); + /* Kernel probe */ DTRACE_SCHED1(swapout__process, proc_t *, pp); - TNF_PROBE_2(swapout_process, "vm swap swapout", /* CSTYLED */, - tnf_pid, pid, pp->p_pid, - tnf_ulong, page_count, ws_pages); } *swrss = ws_pages; return (swapped_lwps); @@ -891,11 +875,6 @@ process_swap_queue(void) /* Kernel probe */ DTRACE_SCHED1(swapout__lwp, kthread_t *, tp); - TNF_PROBE_4(swapout_lwp, "vm swap swapout", /* CSTYLED */, - tnf_pid, pid, pp->p_pid, - tnf_lwpid, lwpid, tp->t_tid, - tnf_kthread_id, tid, tp, - tnf_ulong, page_count, stack_pages); rw_enter(&kas.a_lock, RW_READER); err = segkp_fault(segkp->s_as->a_hat, segkp, tp->t_swap, @@ -939,12 +918,9 @@ process_swap_queue(void) TRACE_2(TR_FAC_SCHED, TR_SWAPQ_PROC, "swaplist_proc: pp %p pages_pushed: %lu", pp, ws_pages); + /* Kernel probe */ DTRACE_SCHED1(swapout__process, proc_t *, pp); - TNF_PROBE_2(swapout_process, "vm swap swapout", - /* CSTYLED */, - tnf_pid, pid, pp->p_pid, - tnf_ulong, page_count, ws_pages); } pp->p_swrss += ws_pages; disp_lock_enter(&swapped_lock); |