From 93e329e1eb3a85e769a6110bce0c59d320248fbb Mon Sep 17 00:00:00 2001 From: Marco Bubke Date: Thu, 30 Aug 2012 17:10:42 +0200 Subject: [PATCH] QmlDesigner.NodeInstances: Use SharedMemory for image transfer if available Sending images over the local socket is slow, but the Mac has a 4MB limit shared memory. So we now use what we get and than fallback to the local socket. Change-Id: Idf40ee1603572c9e45bb1ed3e1abc7caf19e6fca Reviewed-by: Alessandro Portale --- .../qmlpuppet/container/imagecontainer.cpp | 57 ++++++++++++++++++- 1 file changed, 54 insertions(+), 3 deletions(-) diff --git a/share/qtcreator/qml/qmlpuppet/container/imagecontainer.cpp b/share/qtcreator/qml/qmlpuppet/container/imagecontainer.cpp index ce80364a3f9..a5ad0de14de 100644 --- a/share/qtcreator/qml/qmlpuppet/container/imagecontainer.cpp +++ b/share/qtcreator/qml/qmlpuppet/container/imagecontainer.cpp @@ -30,15 +30,21 @@ #include "imagecontainer.h" +#include +#include + namespace QmlDesigner { +static QCache globalSharedMemoryCache(10000); + ImageContainer::ImageContainer() : m_instanceId(-1) { } ImageContainer::ImageContainer(qint32 instanceId, const QImage &image) - : m_image(image), m_instanceId(instanceId) + : m_image(image), + m_instanceId(instanceId) { } @@ -52,6 +58,25 @@ QImage ImageContainer::image() const return m_image; } +static QSharedMemory *createSharedMemory(qint32 key, int byteCount) +{ + QSharedMemory *sharedMemory = globalSharedMemoryCache.take(key); + if (sharedMemory == 0) + sharedMemory = new QSharedMemory(QString::number(key)); + + if (sharedMemory->isAttached()) + sharedMemory->detach(); + + bool sharedMemoryIsCreated = sharedMemory->create(byteCount); + + if (sharedMemoryIsCreated) { + globalSharedMemoryCache.insert(key, sharedMemory); + return sharedMemory; + } + + return 0; +} + QDataStream &operator<<(QDataStream &out, const ImageContainer &container) { out << container.instanceId(); @@ -63,11 +88,31 @@ QDataStream &operator<<(QDataStream &out, const ImageContainer &container) out << image.size(); out << qint32(image.format()); out << qint32(image.byteCount()); - out.writeRawData(reinterpret_cast(image.constBits()), image.byteCount()); + + QSharedMemory *sharedMemory = createSharedMemory(container.instanceId(), image.byteCount()); + + out << qint32(sharedMemory != 0); // send if shared memory is used + + if (sharedMemory) { + qMemCopy(sharedMemory->data(), image.constBits(), image.byteCount()); + } else { + out.writeRawData(reinterpret_cast(image.constBits()), image.byteCount()); + } + return out; } +void readSharedMemory(qint32 key, QImage *image, qint32 byteSize) +{ + QSharedMemory sharedMemory(QString::number(key)); + bool canAttach = sharedMemory.attach(QSharedMemory::ReadOnly); + if (canAttach) + { + qMemCopy(image->bits(), sharedMemory.constData(), byteSize); + } +} + QDataStream &operator>>(QDataStream &in, ImageContainer &container) { @@ -75,6 +120,7 @@ QDataStream &operator>>(QDataStream &in, ImageContainer &container) qint32 bytesPerLine; QSize imageSize; qint32 format; + qint32 sharedmemoryIsUsed; in >> container.m_instanceId; @@ -82,9 +128,14 @@ QDataStream &operator>>(QDataStream &in, ImageContainer &container) in >> imageSize; in >> format; in >> byteSize; + in >> sharedmemoryIsUsed; container.m_image = QImage(imageSize, QImage::Format(format)); - in.readRawData(reinterpret_cast(container.m_image.bits()), byteSize); + + if (sharedmemoryIsUsed) + readSharedMemory(container.instanceId(), &container.m_image, byteSize); + else + in.readRawData(reinterpret_cast(container.m_image.bits()), byteSize); return in; }