Changeset 561 for trunk/src/corelib/tools/qmap.cpp

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/corelib/tools/qmap.cpp (modified) (17 diffs)

trunk/src/corelib/tools/qmap.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the QtCore module of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you 
+** @nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -54 +54 @@
     &shared_null,
     { &shared_null, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
-    Q_BASIC_ATOMIC_INITIALIZER(1), 0, 0, 0, false, true
+    Q_BASIC_ATOMIC_INITIALIZER(1), 0, 0, 0, false, true
 };
 
 QMapData *QMapData::createData()
 {
+
+
+
+
+
     QMapData *d = new QMapData;
+
     Node *e = reinterpret_cast<Node *>(d);
     e->backward = e;
@@ -69 +75 @@
     d->insertInOrder = false;
     d->sharable = true;
+
+
     return d;
 }
@@ -80 +88 @@
         prev = cur;
         cur = cur->forward[0];
-        qFree(reinterpret_cast<char *>(prev) - offset);
+        if (strictAlignment)
+            qFreeAligned(reinterpret_cast<char *>(prev) - offset);
+        else
+            qFree(reinterpret_cast<char *>(prev) - offset);
     }
     delete this;
@@ -86 +97 @@
 
 QMapData::Node *QMapData::node_create(Node *update[], int offset)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 {
     int level = 0;
@@ -94 +124 @@
         mask <<= Sparseness;
     }
-
-    ++randomBits;
-    if (level == 3 && !insertInOrder)
-        randomBits = qrand();
 
     if (level > topLevel) {
@@ -106 +132 @@
     }
 
-    void *concreteNode = qMalloc(offset + sizeof(Node) + level * sizeof(Node *));
+    ++randomBits;
+    if (level == 3 && !insertInOrder)
+        randomBits = qrand();
+
+    void *concreteNode = strictAlignment ?
+                         qMallocAligned(offset + sizeof(Node) + level * sizeof(Node *), alignment) :
+                         qMalloc(offset + sizeof(Node) + level * sizeof(Node *));
+    Q_CHECK_PTR(concreteNode);
+
     Node *abstractNode = reinterpret_cast<Node *>(reinterpret_cast<char *>(concreteNode) + offset);
 
@@ -131 +165 @@
     }
     --size;
-    qFree(reinterpret_cast<char *>(node) - offset);
+    if (strictAlignment)
+        qFreeAligned(reinterpret_cast<char *>(node) - offset);
+    else
+        qFree(reinterpret_cast<char *>(node) - offset);
 }
 
@@ -147 +184 @@
 void QMapData::dump()
 {
-    qDebug("Map data (ref = %d, size = %d, randomBits = %#.8x)", ref.atomic, size, randomBits);
+    qDebug("Map data (ref = %d, size = %d, randomBits = %#.8x)", , size, randomBits);
 
     QString preOutput;
@@ -159 +196 @@
     Node *update[LastLevel + 1];
     for (int i = 0; i <= topLevel; ++i) {
-        str.sprintf("%d: [%.8x] -", i, adjust_ptr(forward[i]));
+        str.sprintf("%d: [%.8x] -", i, adjust_ptr());
         output[i] += str;
-        update[i] = forward[i];
+        update[i] = ;
     }
 
-    Node *node = forward[0];
+    Node *node = ;
     while (node != e) {
         int level = 0;
@@ -179 +216 @@
         }
         for (int j = level + 1; j <= topLevel; ++j)
-            output[j] += "---------------";
+            output[j] += ;
         node = node->forward[0];
     }
 
-    qDebug(preOutput.ascii());
+    qDebug(preOutput.ascii());
     for (int i = 0; i <= topLevel; ++i)
-        qDebug(output[i].ascii());
+        qDebug(output[i].ascii());
 }
 #endif
@@ -195 +232 @@
     \ingroup tools
     \ingroup shared
-    \mainclass
+
     \reentrant
 
@@ -903 +940 @@
 /*! \typedef QMap::iterator::iterator_category
 
-    \internal
+  A synonym for \e {std::bidirectional_iterator_tag} indicating
+  this iterator is a bidirectional iterator.
 */
 
@@ -1124 +1162 @@
 /*! \typedef QMap::const_iterator::iterator_category
 
-    \internal
+  A synonym for \e {std::bidirectional_iterator_tag} indicating
+  this iterator is a bidirectional iterator.
 */
 
@@ -1316 +1355 @@
     \ingroup tools
     \ingroup shared
-    \mainclass
+
     \reentrant