Skip to content

Proposed fix for RT #88975 #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
eserte wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Proposed fix for RT #88975 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2cae6b7
new function has_noload_field
eserte Sep 26, 2013
4c4ee1f
skip some tests if has_noload_field is false
eserte Sep 26, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Process.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@ $VERSION = '0.07';

@EXPORT_OK = (qw(process_info process_list P));

BEGIN {
XSLoader::load __PACKAGE__, $VERSION;

{
my %alias = (
process_pid => 'pid',
parent_pid => 'ppid',
Expand Down Expand Up @@ -62,7 +64,7 @@ BEGIN {
posix_advisory_lock => 'advlock',
has_controlling_terminal => 'controlt',
is_kernel_thread => 'kthread',
no_loadavg_calc => 'noload',
(has_noload_field() ? (no_loadavg_calc => 'noload') : ()),
parent_waiting => 'ppwait',
started_profiling => 'profil',
stopped_profiling => 'stopprof',
Expand Down Expand Up @@ -157,8 +159,6 @@ BEGIN {
}
}

XSLoader::load __PACKAGE__, $VERSION;

sub new {
my $class = shift;
my $pid = shift;
Expand Down
17 changes: 16 additions & 1 deletion Process.xs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,10 @@
#define NO_FREEBSD_5x_pv(a) (a)
#endif

#if __FreeBSD_version < 802501
#define HAS_NOLOAD_FIELD
#endif

static int proc_info_mib[4] = { -1, -1, -1, -1 };

struct kinfo_proc *_proc_request (kvm_t *kd, int request, int param, int *pnr) {
Expand Down Expand Up @@ -292,7 +296,7 @@ HV *_procinfo (struct kinfo_proc *kp, int resolve) {
hv_store(h, "advlock", 7, newSViv(NO_FREEBSD_4x(P_FLAG(P_ADVLOCK))), 0);
hv_store(h, "controlt", 8, newSViv(NO_FREEBSD_4x(P_FLAG(P_CONTROLT))), 0);
hv_store(h, "kthread", 7, newSViv(NO_FREEBSD_4x(P_FLAG(P_KTHREAD))), 0);
#if __FreeBSD_version < 802501
#ifdef HAS_NOLOAD_FIELD
hv_store(h, "noload", 6, newSViv(NO_FREEBSD_4x(P_FLAG(P_NOLOAD))), 0);
#endif
hv_store(h, "ppwait", 6, newSViv(NO_FREEBSD_4x(P_FLAG(P_PPWAIT))), 0);
Expand Down Expand Up @@ -391,6 +395,17 @@ max_kernel_groups()
OUTPUT:
RETVAL

short
has_noload_field()
CODE:
#ifdef HAS_NOLOAD_FIELD
RETVAL = 1;
#else
RETVAL = 0;
#endif
OUTPUT:
RETVAL

SV *
_info(int pid, int resolve)
PREINIT:
Expand Down
6 changes: 5 additions & 1 deletion t/01-func.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,11 @@ ok( defined( delete $info->{childtime} ), 'attribute childtime');
ok( defined( delete $info->{advlock} ), 'attribute advlock');
ok( defined( delete $info->{controlt} ), 'attribute controlt');
ok( defined( delete $info->{kthread} ), 'attribute kthread');
ok( defined( delete $info->{noload} ), 'attribute noload');
SKIP: {
skip "noload not available, probably FreeBSD 9 or newer", 1
if !BSD::Process::has_noload_field;
ok( defined( delete $info->{noload} ), 'attribute noload');
}
ok( defined( delete $info->{ppwait} ), 'attribute ppwait');
ok( defined( delete $info->{profil} ), 'attribute profil');
ok( defined( delete $info->{stopprof} ), 'attribute stopprof');
Expand Down
12 changes: 10 additions & 2 deletions t/02-method.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,11 @@ plan tests => 242
is($pe->advlock, delete $pe->{advlock}, 'method advlock');
is($pe->controlt, delete $pe->{controlt}, 'method controlt');
is($pe->kthread, delete $pe->{kthread}, 'method kthread');
is($pe->noload, delete $pe->{noload}, 'method noload');
SKIP: {
skip "noload not available, probably FreeBSD 9 or newer", 1
if !BSD::Process::has_noload_field;
is($pe->noload, delete $pe->{noload}, 'method noload');
}
is($pe->ppwait, delete $pe->{ppwait}, 'method ppwait');
is($pe->profil, delete $pe->{profil}, 'method profil');
is($pe->stopprof, delete $pe->{stopprof}, 'method stopprof');
Expand Down Expand Up @@ -195,7 +199,11 @@ plan tests => 242
is($pe->posix_advisory_lock, delete $pe->{advlock}, 'alias posix_advisory_lock');
is($pe->has_controlling_terminal, delete $pe->{controlt}, 'alias has_controlling_terminal');
is($pe->is_kernel_thread, delete $pe->{kthread}, 'alias is_kernel_thread');
is($pe->no_loadavg_calc, delete $pe->{noload}, 'alias no_loadavg_calc');
SKIP: {
skip "noload not available, probably FreeBSD 9 or newer", 1
if !BSD::Process::has_noload_field;
is($pe->no_loadavg_calc, delete $pe->{noload}, 'alias no_loadavg_calc');
}
is($pe->parent_waiting, delete $pe->{ppwait}, 'alias parent_waiting');
is($pe->started_profiling, delete $pe->{profil}, 'alias started_profiling');
is($pe->stopped_profiling, delete $pe->{stopprof}, 'alias stopped_profiling');
Expand Down