← Back to branch summary

~ubuntu-branches/ubuntu/vivid/virtualbox-ose/vivid

« back to all changes in this revision

Viewing changes to src/VBox/Runtime/r3/linux/semeventmulti-linux.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2010-03-11 17:16:37 UTC
  • mfrom: (0.3.4 upstream) (0.4.8 sid)
  • Revision ID: james.westby@ubuntu.com-20100311171637-43z64ia3ccpj8vqn
Tags: 3.1.4-dfsg-2ubuntu1
https://launchpad.net/bugs/528561
https://launchpad.net/bugs/288590
https://launchpad.net/bugs/535297
* Merge from Debian unstable (LP: #528561), remaining changes:
  - 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
  - Replace *-source packages with transitional packages for *-dkms
* Fix crash in vboxvideo_drm with kernel 2.6.33 / backported drm code
  (LP: #535297)
* Add a list of linux-headers packages to the apport hook
* Update debian/patches/u02-lp-integration.dpatch with a
  DEP-3 compliant header
* Add ${misc:Depends} to virtualbox-ose-source and virtualbox-ose-guest-source
  Depends

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/Runtime/r3/linux/semeventmulti-linux.cpp
223
223
        if (!cMillies)
224
224
            return VERR_TIMEOUT;
225
225
        ts.tv_sec  = cMillies / 1000;
226
 
        ts.tv_nsec = (cMillies % 1000) * 1000000;
227
 
        u64End = RTTimeSystemNanoTS() + cMillies * 1000000;
 
226
        ts.tv_nsec = (cMillies % 1000) * UINT32_C(1000000);
 
227
        u64End = RTTimeSystemNanoTS() + cMillies * UINT64_C(1000000);
228
228
        pTimeout = &ts;
229
229
    }
230
230
 
248
248
                int64_t i64Diff = u64End - RTTimeSystemNanoTS();
249
249
                if (i64Diff < 1000)
250
250
                    return VERR_TIMEOUT;
251
 
                ts.tv_sec  = i64Diff / 1000000000;
252
 
                ts.tv_nsec = i64Diff % 1000000000;
 
251
                ts.tv_sec  = (uint64_t)i64Diff / UINT32_C(1000000000);
 
252
                ts.tv_nsec = (uint64_t)i64Diff % UINT32_C(1000000000);
253
253
            }
254
254
            long rc = sys_futex(&pThis->iState, FUTEX_WAIT, 1, pTimeout, NULL, 0);
255
255
            if (RT_UNLIKELY(pThis->iMagic != RTSEMEVENTMULTI_MAGIC))