← Back to branch summary

~ubuntu-branches/ubuntu/precise/virtualbox/precise-updates

« back to all changes in this revision

Viewing changes to src/VBox/Additions/common/VBoxService/VBoxServicePipeBuf.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2011-10-17 23:23:09 UTC
  • mfrom: (3.1.5 sid)
  • Revision ID: james.westby@ubuntu.com-20111017232309-kzm6841lzk61ranj
Tags: 4.1.4-dfsg-1
http://bugs.debian.org/507188
http://bugs.debian.org/637349
https://launchpad.net/bugs/840668
* New upstream release.
  - Fixes missing icons when using pt_BR locale. (Closes: #507188)
  - Fixes guest additions download url. (Closes: #637349; LP: #840668)
* Refresh patches.
* Drop the vboxmouse x11 driver. The mouse integration is now completely
  handled by the kernel module.
* Restrict dh_pycentral to the virtualbox binary package.
* Merge changes from the Ubuntu package but use them only when built
  on Ubuntu:
  - Add an Apport hook.
  - Add vboxguest modalias to the package control field.
* Pass KBUILD_VERBOSE=2 to kmk.
* Add 36-fix-text-mode.patch to fix text mode when using the vboxvideo driver.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/Additions/common/VBoxService/VBoxServicePipeBuf.cpp
1
 
/* $Id: VBoxServicePipeBuf.cpp 38437 2011-08-12 15:05:41Z vboxsync $ */
 
1
/* $Id: VBoxServicePipeBuf.cpp $ */
2
2
/** @file
3
3
 * VBoxServicePipeBuf - Pipe buffering.
4
4
 */
111
111
            pBuf->cbOffset += cbToRead;
112
112
 
113
113
#ifdef DEBUG_andy
114
 
            VBoxServiceVerbose(4, "Pipe [%u %u 0x%p %s] read pcbToRead=%u, cbSize=%u, cbAlloc=%u, cbOff=%u\n",
 
114
            VBoxServiceVerbose(4, "Pipe [%u %u 0x%p %s] read cbToRead=%u, cbSize=%u, cbAlloc=%u, cbOff=%u\n",
115
115
                               pBuf->uPID, pBuf->uPipeId, pBuf, pBuf->fEnabled ? "EN" : "DIS", cbToRead, pBuf->cbSize, pBuf->cbAllocated, pBuf->cbOffset);
116
116
#endif
117
 
            if (pBuf->hEventSem != NIL_RTSEMEVENT)
118
 
            {
119
 
                rc = RTSemEventSignal(pBuf->hEventSem);
120
 
                AssertRC(rc);
121
 
            }
 
117
            /* Don't signal event semaphore here -- we only read out something from
 
118
             * this pipe buffer. */
122
119
 
123
120
            *pcbToRead = cbToRead;
124
121
        }
401
398
    if (RT_SUCCESS(rc))
402
399
    {
403
400
        fEnabled = pBuf->fEnabled;
404
 
        RTCritSectLeave(&pBuf->CritSect);
 
401
        rc = RTCritSectLeave(&pBuf->CritSect);
 
402
        AssertRC(rc);
405
403
    }
406
404
    return fEnabled;
407
405
}
452
450
        if (   pBuf->fEnabled != fEnabledOld
453
451
            && pBuf->hEventSem)
454
452
        {
 
453
#ifdef DEBUG_andy
 
454
            VBoxServiceVerbose(4, "Pipe [%u %u] status %s -> %s\n",
 
455
                               pBuf->uPID, pBuf->uPipeId,
 
456
                               fEnabledOld ? "EN" : "DIS", pBuf->fEnabled ? "EN" : "DIS");
 
457
#endif
455
458
            /* Let waiter know that something has changed ... */
456
459
            RTSemEventSignal(pBuf->hEventSem);
457
460
        }