← Back to branch summary

~ubuntu-branches/ubuntu/trusty/virtualbox-ose/trusty

« back to all changes in this revision

Viewing changes to src/VBox/Runtime/common/time/timeprog.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/Runtime/common/time/timeprog.cpp
33
33
*   Header Files                                                               *
34
34
*******************************************************************************/
35
35
#include <iprt/time.h>
 
36
#include "internal/iprt.h"
 
37
 
36
38
#include <iprt/assert.h>
37
39
#include "internal/time.h"
38
40
 
47
49
{
48
50
    return RTTimeNanoTS() - g_u64ProgramStartNanoTS;
49
51
}
 
52
RT_EXPORT_SYMBOL(RTTimeProgramNanoTS);
50
53
 
51
54
 
52
55
/**
58
61
{
59
62
    return RTTimeProgramNanoTS() / 1000;
60
63
}
 
64
RT_EXPORT_SYMBOL(RTTimeProgramMicroTS);
61
65
 
62
66
 
63
67
/**
69
73
{
70
74
    return RTTimeMilliTS() - g_u64ProgramStartMilliTS;
71
75
}
 
76
RT_EXPORT_SYMBOL(RTTimeProgramMilliTS);
72
77
 
73
78
 
74
79
/**
81
86
    AssertMsg(g_u64ProgramStartMilliTS, ("RTR3Init hasn't been called!\n"));
82
87
    return (uint32_t)(RTTimeProgramMilliTS() / 1000);
83
88
}
 
89
RT_EXPORT_SYMBOL(RTTimeProgramSecTS);
84
90
 
85
91
 
86
92
/**
92
98
{
93
99
    return g_u64ProgramStartNanoTS;
94
100
}
 
101
RT_EXPORT_SYMBOL(RTTimeProgramStartNanoTS);
 
102