Added native key support to QSharedMemory API.

Methods setNativeKey() and nativeKey() were added to
QSharedMemory API. Shared memory's native key is returned
by nativeKey() and it is set with either setKey() or
setNativeKey(). setKey() leads to a native key that is
platform independent while setNativeKey() directly sets
the native key without any mangling.

When using setNativeKey(), key() returns a null string
and shared memory's system semaphore is not set. This
means that is up to the user to define a such protection
mechanism (i.e. lock() can't be used on native keys).

QSharedMemory tests were updated.

Merge-request: 1497
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>

1 files changed, 7 insertions, 8 deletions

diff --git a/src/corelib/kernel/qsharedmemory_unix.cpp b/src/corelib/kernel/qsharedmemory_unix.cpp
index a5f79c25d6..064979b0f6 100644
--- a/src/corelib/kernel/qsharedmemory_unix.cpp
+++ b/src/corelib/kernel/qsharedmemory_unix.cpp
@@ -116,21 +116,20 @@ key_t QSharedMemoryPrivate::handle()
         return unix_key;
 
     // don't allow making handles on empty keys
-    if (key.isEmpty()) {
+    if (nativeKey.isEmpty()) {
         errorString = QSharedMemory::tr("%1: key is empty").arg(QLatin1String("QSharedMemory::handle:"));
         error = QSharedMemory::KeyError;
         return 0;
     }
 
     // ftok requires that an actual file exists somewhere
-    QString fileName = makePlatformSafeKey(key);
-    if (!QFile::exists(fileName)) {
+    if (!QFile::exists(nativeKey)) {
         errorString = QSharedMemory::tr("%1: UNIX key file doesn't exist").arg(QLatin1String("QSharedMemory::handle:"));
         error = QSharedMemory::NotFound;
         return 0;
     }
 
-    unix_key = ftok(QFile::encodeName(fileName).constData(), 'Q');
+    unix_key = ftok(QFile::encodeName(nativeKey).constData(), 'Q');
     if (-1 == unix_key) {
         errorString = QSharedMemory::tr("%1: ftok failed").arg(QLatin1String("QSharedMemory::handle:"));
         error = QSharedMemory::KeyError;
@@ -181,7 +180,7 @@ bool QSharedMemoryPrivate::create(int size)
 {
     // build file if needed
     bool createdFile = false;
-    int built = createUnixKeyFile(makePlatformSafeKey(key));
+    int built = createUnixKeyFile(nativeKey);
     if (built == -1) {
         errorString = QSharedMemory::tr("%1: unable to make key").arg(QLatin1String("QSharedMemory::handle:"));
         error = QSharedMemory::KeyError;
@@ -194,7 +193,7 @@ bool QSharedMemoryPrivate::create(int size)
     // get handle
     if (!handle()) {
         if (createdFile)
-            QFile::remove(makePlatformSafeKey(key));
+            QFile::remove(nativeKey);
         return false;
     }
 
@@ -210,7 +209,7 @@ bool QSharedMemoryPrivate::create(int size)
             setErrorString(function);
         }
         if (createdFile && error != QSharedMemory::AlreadyExists)
-            QFile::remove(makePlatformSafeKey(key));
+            QFile::remove(nativeKey);
         return false;
     }
 
@@ -295,7 +294,7 @@ bool QSharedMemoryPrivate::detach()
         }
 
         // remove file
-        if (!QFile::remove(makePlatformSafeKey(key)))
+        if (!QFile::remove(nativeKey))
             return false;
     }
     return true;