← Back to branch summary

~ubuntu-branches/ubuntu/raring/virtualbox-ose/raring

« back to all changes in this revision

Viewing changes to src/VBox/Main/freebsd/PerformanceFreeBSD.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2009-12-18 16:44:29 UTC
  • mfrom: (0.3.3 upstream) (0.4.6 squeeze)
  • Revision ID: james.westby@ubuntu.com-20091218164429-jd34ccexpv5na11a
Tags: 3.1.2-dfsg-1ubuntu1
https://launchpad.net/bugs/498219
https://launchpad.net/bugs/288590
https://launchpad.net/bugs/474625
https://launchpad.net/bugs/495935
https://launchpad.net/bugs/473334
* Merge from Debian unstable (LP: #498219), remaining changes:
  - Disable update action
    - debian/patches/u01-disable-update-action.dpatch
  - VirtualBox should go in Accessories, not in System tools (LP: #288590)
    - debian/virtualbox-ose-qt.files/virtualbox-ose.desktop
  - Add Apport hook
    - debian/virtualbox-ose.files/source_virtualbox-ose.py
    - debian/virtualbox-ose.install
  - Add Launchpad integration
    - debian/control
    - debian/lpi-bug.xpm
    - debian/patches/u02-lp-integration.dpatch
* Fixes the following bugs:
  - Kernel module fails to build with Linux >= 2.6.32 (LP: #474625)
  - X.Org drivers need to be rebuilt against X-Server 1.7 (LP: #495935)
  - The *-source packages try to build the kernel modules even though the
    kernel headers aren't available (LP: #473334)
* Replace *-source packages with transitional packages for *-dkms.
* Adapt u01-disable-update-action.dpatch and u02-lp-integration.dpatch for
  new upstream version.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/Main/freebsd/PerformanceFreeBSD.cpp
65
65
    int rc = VINF_SUCCESS;
66
66
    u_long cbMemPhys = 0;
67
67
    u_int cPagesMemFree = 0;
 
68
    u_int cPagesMemInactive = 0;
 
69
    u_int cPagesMemCached = 0;
68
70
    u_int cPagesMemUsed = 0;
69
71
    int cbPage = 0;
70
72
    size_t cbParameter = sizeof(cbMemPhys);
79
81
    cbParameter = sizeof(cPagesMemUsed);
80
82
    if (!sysctlbyname("vm.stats.vm.v_active_count", &cPagesMemUsed, &cbParameter, NULL, 0))
81
83
        cProcessed++;
 
84
    cbParameter = sizeof(cPagesMemInactive);
 
85
    if (!sysctlbyname("vm.stats.vm.v_inactive_count", &cPagesMemInactive, &cbParameter, NULL, 0))
 
86
        cProcessed++;
 
87
    cbParameter = sizeof(cPagesMemCached);
 
88
    if (!sysctlbyname("vm.stats.vm.v_cache_count", &cPagesMemCached, &cbParameter, NULL, 0))
 
89
        cProcessed++;
82
90
    cbParameter = sizeof(cbPage);
83
91
    if (!sysctlbyname("hw.pagesize", &cbPage, &cbParameter, NULL, 0))
84
92
        cProcessed++;
85
93
 
86
 
    if (cProcessed == 4)
 
94
    if (cProcessed == 6)
87
95
    {
88
96
        *total     = cbMemPhys / _1K;
89
97
        *used      = cPagesMemUsed * (cbPage / _1K);
90
 
        *available = cPagesMemFree * (cbPage / _1K);
 
98
        *available = (cPagesMemFree + cPagesMemInactive + cPagesMemCached ) * (cbPage / _1K);
91
99
    }
92
100
    else
93
101
        rc = VERR_NOT_SUPPORTED;