ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/i-scream/projects/libstatgrab/src/libstatgrab/tools.c
(Generate patch)

Comparing projects/libstatgrab/src/libstatgrab/tools.c (file contents):
Revision 1.29 by tdb, Sat Feb 14 12:38:18 2004 UTC vs.
Revision 1.36 by ats, Sun Apr 4 23:48:26 2004 UTC

# Line 34 | Line 34
34   #ifdef ALLBSD
35   #include <fcntl.h>
36   #endif
37 < #ifdef FREEBSD
37 > #if (defined(FREEBSD) && !defined(FREEBSD5)) || defined(DFBSD)
38   #include <kvm.h>
39 + #include <paths.h>
40   #endif
41   #if defined(NETBSD) || defined(OPENBSD)
42   #include <uvm/uvm_extern.h>
# Line 420 | Line 421 | long long get_ll_match(char *line, regmatch_t *match){
421          return num;
422   }
423  
424 < #ifdef FREEBSD
424 > #if (defined(FREEBSD) && !defined(FREEBSD5)) || defined(DFBSD)
425   kvm_t *get_kvm() {
426          static kvm_t *kvmd = NULL;
427  
# Line 431 | Line 432 | kvm_t *get_kvm() {
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   #if defined(NETBSD) || defined(OPENBSD)
# Line 438 | Line 451 | struct uvmexp *get_uvmexp() {
451          int mib[2];
452          size_t size;
453          static struct uvmexp *uvm = NULL;
454 +        struct uvmexp *new;
455  
456          mib[0] = CTL_VM;
457          mib[1] = VM_UVMEXP;
# Line 446 | Line 460 | struct uvmexp *get_uvmexp() {
460                  return NULL;
461          }
462  
463 <        uvm = realloc(uvm, size);
464 <        if (uvm == NULL) {
463 >        new = realloc(uvm, size);
464 >        if (new == NULL) {
465                  return NULL;
466          }
467 +        uvm = new;
468  
469          if (sysctl(mib, 2, uvm, &size, NULL, 0) < 0) {
470                  return NULL;
# Line 460 | Line 475 | struct uvmexp *get_uvmexp() {
475   #endif
476  
477   int statgrab_init(){
478 < #ifdef FREEBSD
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          }

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines