diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2017-03-08 13:13:12 +0100 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2017-03-17 06:10:16 +0000 |
| commit | f418d1b26a1f8e3e9d3a81017fee5c60fad5669f (patch) | |
| tree | 7e8f29a31651aa9b5901fd7584cbd63cf3993da5 /src/plugins/sqldrivers/psql/qsql_psql.cpp | |
| parent | b21069d6fa74273afbdab9af3a6ac89038e4a2b8 (diff) | |
Remove a Q_GLOBAL_STATIC with QMutex in favor of QBasicAtomicInt
Much simpler, no memory allocation, no locking.
Change-Id: Iae839f6a131a4f0784bffffd14a9e70c7b62d9a7
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Diffstat (limited to 'src/plugins/sqldrivers/psql/qsql_psql.cpp')
| -rw-r--r-- | src/plugins/sqldrivers/psql/qsql_psql.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/plugins/sqldrivers/psql/qsql_psql.cpp b/src/plugins/sqldrivers/psql/qsql_psql.cpp index 968b71a27d..7fa1ff7da5 100644 --- a/src/plugins/sqldrivers/psql/qsql_psql.cpp +++ b/src/plugins/sqldrivers/psql/qsql_psql.cpp @@ -50,7 +50,6 @@ #include <qsqlquery.h> #include <qsocketnotifier.h> #include <qstringlist.h> -#include <qmutex.h> #include <QtSql/private/qsqlresult_p.h> #include <QtSql/private/qsqldriver_p.h> @@ -618,13 +617,10 @@ static QString qCreateParamString(const QVector<QVariant> &boundValues, const QS return params; } -Q_GLOBAL_STATIC(QMutex, qMutex) QString qMakePreparedStmtId() { - qMutex()->lock(); - static unsigned int qPreparedStmtCount = 0; - QString id = QLatin1String("qpsqlpstmt_") + QString::number(++qPreparedStmtCount, 16); - qMutex()->unlock(); + static QBasicAtomicInt qPreparedStmtCount = Q_BASIC_ATOMIC_INITIALIZER(0); + QString id = QLatin1String("qpsqlpstmt_") + QString::number(qPreparedStmtCount.fetchAndAddRelaxed(1) + 1, 16); return id; } |