linprocfs.c (71471) | linprocfs.c (72200) |
---|---|
1/* 2 * Copyright (c) 2000 Dag-Erling Co�dan Sm�rgrav 3 * Copyright (c) 1999 Pierre Beyssac 4 * Copyright (c) 1993 Jan-Simon Pendry 5 * Copyright (c) 1993 6 * The Regents of the University of California. All rights reserved. 7 * 8 * This code is derived from software contributed to Berkeley by --- 24 unchanged lines hidden (view full) --- 33 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 34 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 35 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 36 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 37 * SUCH DAMAGE. 38 * 39 * @(#)procfs_status.c 8.4 (Berkeley) 6/15/94 40 * | 1/* 2 * Copyright (c) 2000 Dag-Erling Co�dan Sm�rgrav 3 * Copyright (c) 1999 Pierre Beyssac 4 * Copyright (c) 1993 Jan-Simon Pendry 5 * Copyright (c) 1993 6 * The Regents of the University of California. All rights reserved. 7 * 8 * This code is derived from software contributed to Berkeley by --- 24 unchanged lines hidden (view full) --- 33 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 34 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 35 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 36 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 37 * SUCH DAMAGE. 38 * 39 * @(#)procfs_status.c 8.4 (Berkeley) 6/15/94 40 * |
41 * $FreeBSD: head/sys/compat/linprocfs/linprocfs.c 71471 2001-01-23 22:13:07Z jhb $ | 41 * $FreeBSD: head/sys/compat/linprocfs/linprocfs.c 72200 2001-02-09 06:11:45Z bmilekic $ |
42 */ 43 44#include <sys/param.h> 45#include <sys/blist.h> 46#include <sys/dkstat.h> 47#include <sys/jail.h> 48#include <sys/kernel.h> 49#include <sys/proc.h> --- 399 unchanged lines hidden (view full) --- 449 char *ps; 450 char *state; 451 int i, r, xlen; 452 segsz_t lsize; 453 pid_t ppid; 454 455 sbuf_new(&sb, NULL, 1024, 0); 456 | 42 */ 43 44#include <sys/param.h> 45#include <sys/blist.h> 46#include <sys/dkstat.h> 47#include <sys/jail.h> 48#include <sys/kernel.h> 49#include <sys/proc.h> --- 399 unchanged lines hidden (view full) --- 449 char *ps; 450 char *state; 451 int i, r, xlen; 452 segsz_t lsize; 453 pid_t ppid; 454 455 sbuf_new(&sb, NULL, 1024, 0); 456 |
457 mtx_enter(&sched_lock, MTX_SPIN); | 457 mtx_lock_spin(&sched_lock); |
458 if (p->p_stat > sizeof state_str / sizeof *state_str) 459 state = state_str[0]; 460 else 461 state = state_str[(int)p->p_stat]; | 458 if (p->p_stat > sizeof state_str / sizeof *state_str) 459 state = state_str[0]; 460 else 461 state = state_str[(int)p->p_stat]; |
462 mtx_exit(&sched_lock, MTX_SPIN); | 462 mtx_unlock_spin(&sched_lock); |
463 464 PROCTREE_LOCK(PT_SHARED); 465 ppid = p->p_pptr ? p->p_pptr->p_pid : 0; 466 PROCTREE_LOCK(PT_RELEASE); 467 fill_kinfo_proc(p, &kp); 468 sbuf_printf(&sb, "Name:\t%s\n", p->p_comm); /* XXX escape */ 469 sbuf_printf(&sb, "State:\t%s\n", state); 470 --- 82 unchanged lines hidden --- | 463 464 PROCTREE_LOCK(PT_SHARED); 465 ppid = p->p_pptr ? p->p_pptr->p_pid : 0; 466 PROCTREE_LOCK(PT_RELEASE); 467 fill_kinfo_proc(p, &kp); 468 sbuf_printf(&sb, "Name:\t%s\n", p->p_comm); /* XXX escape */ 469 sbuf_printf(&sb, "State:\t%s\n", state); 470 --- 82 unchanged lines hidden --- |