circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-11-04 09:26:05 +00:00
Code Issues Projects Releases Wiki Activity

Sync OpenBSD patchset 182:

Browse Source 
Go to the next if the current best process is replaced, don't keep comparing
it with itself. Also fix process name comparison.
This commit is contained in:
Tiago Cunha
2009-07-28 22:26:13 +00:00
parent a3fc9dee32
commit 6043d9cf89
1 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
osdep-openbsd.c
View File

@@ -1,4 +1,4 @@
/* $Id: osdep-openbsd.c,v 1.16 2009-06-26 15:31:15 nicm Exp $ */
/* $Id: osdep-openbsd.c,v 1.17 2009-07-28 22:26:13 tcunha Exp $ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -82,41 +82,48 @@ retry:
continue;
}
if (is_runnable(p) && !is_runnable(bestp))
if (is_runnable(p) && !is_runnable(bestp)) {
bestp = p;
else if (!is_runnable(p) && is_runnable(bestp))
continue;
} else if (!is_runnable(p) && is_runnable(bestp))
continue;
if (!is_stopped(p) && is_stopped(bestp))
if (!is_stopped(p) && is_stopped(bestp)) {
bestp = p;
else if (is_stopped(p) && !is_stopped(bestp))
continue;
} else if (is_stopped(p) && !is_stopped(bestp))
continue;
if (p->p_estcpu > bestp->p_estcpu)
if (p->p_estcpu > bestp->p_estcpu) {
bestp = p;
else if (p->p_estcpu < bestp->p_estcpu)
continue;
} else if (p->p_estcpu < bestp->p_estcpu)
continue;
if (p->p_slptime < bestp->p_slptime)
if (p->p_slptime < bestp->p_slptime) {
bestp = p;
else if (p->p_slptime > bestp->p_slptime)
continue;
} else if (p->p_slptime > bestp->p_slptime)
continue;
if (p->p_flag & P_SINTR && !(bestp->p_flag & P_SINTR))
if (p->p_flag & P_SINTR && !(bestp->p_flag & P_SINTR)) {
bestp = p;
else if (!(p->p_flag & P_SINTR) && bestp->p_flag & P_SINTR)
continue;
} else if (!(p->p_flag & P_SINTR) && bestp->p_flag & P_SINTR)
continue;
if (LIST_FIRST(&p->p_children) == NULL &&
LIST_FIRST(&bestp->p_children) != NULL) /* XXX ugh */
LIST_FIRST(&bestp->p_children) != NULL) { /* XXX ugh */
bestp = p;
else if (LIST_FIRST(&p->p_children) != NULL &&
continue;
} else if (LIST_FIRST(&p->p_children) != NULL &&
LIST_FIRST(&bestp->p_children) == NULL)
continue;
if (strcmp(p->p_comm, p->p_comm) < 0)
if (strcmp(p->p_comm, bestp->p_comm) < 0) {
bestp = p;
else if (strcmp(p->p_comm, p->p_comm) > 0)
continue;
} else if (strcmp(p->p_comm, bestp->p_comm) > 0)
continue;
if (p->p_pid > bestp->p_pid)