33 |
|
#include <regex.h> |
34 |
|
#ifdef ALLBSD |
35 |
|
#include <fcntl.h> |
36 |
+ |
#endif |
37 |
+ |
#if (defined(FREEBSD) && !defined(FREEBSD5)) || defined(DFBSD) |
38 |
|
#include <kvm.h> |
39 |
+ |
#include <paths.h> |
40 |
|
#endif |
41 |
< |
#ifdef NETBSD |
41 |
> |
#if defined(NETBSD) || defined(OPENBSD) |
42 |
|
#include <uvm/uvm_extern.h> |
43 |
+ |
#include <sys/param.h> |
44 |
+ |
#include <sys/sysctl.h> |
45 |
|
#endif |
46 |
|
|
47 |
|
#include "tools.h" |
48 |
|
|
49 |
|
#ifdef SOLARIS |
50 |
+ |
#ifdef HAVE_LIBDEVINFO_H |
51 |
|
#include <libdevinfo.h> |
52 |
+ |
#endif |
53 |
|
#include <kstat.h> |
54 |
|
#include <unistd.h> |
55 |
|
#include <ctype.h> |
421 |
|
return num; |
422 |
|
} |
423 |
|
|
424 |
< |
#ifdef ALLBSD |
424 |
> |
#if (defined(FREEBSD) && !defined(FREEBSD5)) || defined(DFBSD) |
425 |
|
kvm_t *get_kvm() { |
426 |
|
static kvm_t *kvmd = NULL; |
427 |
|
|
432 |
|
kvmd = kvm_openfiles(NULL, NULL, NULL, O_RDONLY, NULL); |
433 |
|
return kvmd; |
434 |
|
} |
435 |
+ |
|
436 |
+ |
/* Can't think of a better name for this function */ |
437 |
+ |
kvm_t *get_kvm2() { |
438 |
+ |
static kvm_t *kvmd2 = NULL; |
439 |
+ |
|
440 |
+ |
if (kvmd2 != NULL) { |
441 |
+ |
return kvmd2; |
442 |
+ |
} |
443 |
+ |
|
444 |
+ |
kvmd2 = kvm_openfiles(_PATH_DEVNULL, _PATH_DEVNULL, NULL, O_RDONLY, NULL); |
445 |
+ |
return kvmd2; |
446 |
+ |
} |
447 |
|
#endif |
448 |
|
|
449 |
< |
#ifdef NETBSD |
449 |
> |
#if defined(NETBSD) || defined(OPENBSD) |
450 |
|
struct uvmexp *get_uvmexp() { |
451 |
< |
static u_long addr = 0; |
452 |
< |
static struct uvmexp uvm; |
453 |
< |
kvm_t *kvmd = get_kvm(); |
451 |
> |
int mib[2]; |
452 |
> |
size_t size; |
453 |
> |
static struct uvmexp *uvm = NULL; |
454 |
> |
struct uvmexp *new; |
455 |
|
|
456 |
< |
if (kvmd == NULL) { |
456 |
> |
mib[0] = CTL_VM; |
457 |
> |
mib[1] = VM_UVMEXP; |
458 |
> |
|
459 |
> |
if (sysctl(mib, 2, NULL, &size, NULL, 0) < 0) { |
460 |
|
return NULL; |
461 |
|
} |
462 |
|
|
463 |
< |
if (addr == 0) { |
464 |
< |
struct nlist symbols[] = { |
465 |
< |
{ "_uvmexp" }, |
443 |
< |
{ NULL } |
444 |
< |
}; |
445 |
< |
|
446 |
< |
if (kvm_nlist(kvmd, symbols) != 0) { |
447 |
< |
return NULL; |
448 |
< |
} |
449 |
< |
addr = symbols[0].n_value; |
463 |
> |
new = realloc(uvm, size); |
464 |
> |
if (new == NULL) { |
465 |
> |
return NULL; |
466 |
|
} |
467 |
+ |
uvm = new; |
468 |
|
|
469 |
< |
if (kvm_read(kvmd, addr, &uvm, sizeof uvm) != sizeof uvm) { |
469 |
> |
if (sysctl(mib, 2, uvm, &size, NULL, 0) < 0) { |
470 |
|
return NULL; |
471 |
|
} |
472 |
< |
return &uvm; |
472 |
> |
|
473 |
> |
return uvm; |
474 |
|
} |
475 |
|
#endif |
476 |
|
|
477 |
|
int statgrab_init(){ |
478 |
< |
#ifdef ALLBSD |
478 |
> |
#if (defined(FREEBSD) && !defined(FREEBSD5)) || defined(DFBSD) |
479 |
|
{ |
480 |
|
kvm_t *kvmd = get_kvm(); |
481 |
|
if (kvmd == NULL) return 1; |
482 |
|
} |
483 |
+ |
{ |
484 |
+ |
kvm_t *kvmd2 = get_kvm2(); |
485 |
+ |
if (kvmd2 == NULL) return 1; |
486 |
+ |
} |
487 |
|
#endif |
488 |
< |
#ifdef NETBSD |
488 |
> |
#if defined(NETBSD) || defined(OPENBSD) |
489 |
|
{ |
490 |
+ |
/* This should always succeed, but it seems that on some |
491 |
+ |
* versions of NetBSD the first call to get_uvmexp will return |
492 |
+ |
* a non-filled-in structure; this is a workaround for that. |
493 |
+ |
*/ |
494 |
|
struct uvmexp *uvm = get_uvmexp(); |
495 |
|
if (uvm == NULL) return 1; |
496 |
|
} |