Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Skip the captured properties step in bindings
Objects and notifiers in the capturedProperties list were not guarded which can lead to crashes if they're deleted prior to the binding completing. Now the notifiers are connected to and guarded immediately to prevent this. Change-Id: I912e323c52bf6169fb5077e552d5d38d9aa7faec Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
- Loading branch information
Aaron Kennedy
authored and
Qt by Nokia
committed
Nov 4, 2011
1 parent
0dd8675
commit f9261fe
Showing
16 changed files
with
476 additions
and
132 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,220 @@ | ||
/**************************************************************************** | ||
** | ||
** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). | ||
** All rights reserved. | ||
** Contact: Nokia Corporation (qt-info@nokia.com) | ||
** | ||
** This file is part of the QtDeclarative module of the Qt Toolkit. | ||
** | ||
** $QT_BEGIN_LICENSE:LGPL$ | ||
** GNU Lesser General Public License Usage | ||
** This file may be used under the terms of the GNU Lesser General Public | ||
** License version 2.1 as published by the Free Software Foundation and | ||
** appearing in the file LICENSE.LGPL included in the packaging of this | ||
** file. Please review the following information to ensure the GNU Lesser | ||
** General Public License version 2.1 requirements 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.1, included in the file LGPL_EXCEPTION.txt in this package. | ||
** | ||
** GNU General Public License Usage | ||
** Alternatively, this file may be used under the terms of the GNU General | ||
** Public License version 3.0 as published by the Free Software Foundation | ||
** and appearing in the file LICENSE.GPL included in the packaging of this | ||
** file. Please review the following information to ensure the GNU General | ||
** Public License version 3.0 requirements will be met: | ||
** http://www.gnu.org/copyleft/gpl.html. | ||
** | ||
** Other Usage | ||
** Alternatively, this file may be used in accordance with the terms and | ||
** conditions contained in a signed written agreement between you and Nokia. | ||
** | ||
** | ||
** | ||
** | ||
** | ||
** $QT_END_LICENSE$ | ||
** | ||
****************************************************************************/ | ||
|
||
#ifndef QRECYCLEPOOL_P_H | ||
#define QRECYCLEPOOL_P_H | ||
|
||
// | ||
// W A R N I N G | ||
// ------------- | ||
// | ||
// This file is not part of the Qt API. It exists purely as an | ||
// implementation detail. This header file may change from version to | ||
// version without notice, or even be removed. | ||
// | ||
// We mean it. | ||
// | ||
|
||
QT_BEGIN_NAMESPACE | ||
|
||
#define QRECYCLEPOOLCOOKIE 0x33218ADF | ||
|
||
template<typename T, int Step> | ||
class QRecyclePoolPrivate | ||
{ | ||
public: | ||
QRecyclePoolPrivate() | ||
: recyclePoolHold(true), outstandingItems(0), cookie(QRECYCLEPOOLCOOKIE), | ||
currentPage(0), nextAllocated(0) | ||
{ | ||
} | ||
|
||
bool recyclePoolHold; | ||
int outstandingItems; | ||
quint32 cookie; | ||
|
||
struct PoolType : public T { | ||
union { | ||
QRecyclePoolPrivate<T, Step> *pool; | ||
PoolType *nextAllocated; | ||
}; | ||
}; | ||
|
||
struct Page { | ||
Page *nextPage; | ||
unsigned int free; | ||
union { | ||
char array[Step * sizeof(PoolType)]; | ||
qint64 q_for_alignment_1; | ||
double q_for_alignment_2; | ||
}; | ||
}; | ||
|
||
Page *currentPage; | ||
PoolType *nextAllocated; | ||
|
||
inline T *allocate(); | ||
static inline void dispose(T *); | ||
inline void releaseIfPossible(); | ||
}; | ||
|
||
template<typename T, int Step = 1024> | ||
class QRecyclePool | ||
{ | ||
public: | ||
inline QRecyclePool(); | ||
inline ~QRecyclePool(); | ||
|
||
inline T *New(); | ||
template<typename T1> | ||
inline T *New(const T1 &); | ||
template<typename T1> | ||
inline T *New(T1 &); | ||
|
||
static inline void Delete(T *); | ||
|
||
private: | ||
QRecyclePoolPrivate<T, Step> *d; | ||
}; | ||
|
||
template<typename T, int Step> | ||
QRecyclePool<T, Step>::QRecyclePool() | ||
: d(new QRecyclePoolPrivate<T, Step>()) | ||
{ | ||
} | ||
|
||
template<typename T, int Step> | ||
QRecyclePool<T, Step>::~QRecyclePool() | ||
{ | ||
d->recyclePoolHold = false; | ||
d->releaseIfPossible(); | ||
} | ||
|
||
template<typename T, int Step> | ||
T *QRecyclePool<T, Step>::New() | ||
{ | ||
T *rv = d->allocate(); | ||
new (rv) T; | ||
return rv; | ||
} | ||
|
||
template<typename T, int Step> | ||
template<typename T1> | ||
T *QRecyclePool<T, Step>::New(const T1 &a) | ||
{ | ||
T *rv = d->allocate(); | ||
new (rv) T(a); | ||
return rv; | ||
} | ||
|
||
template<typename T, int Step> | ||
template<typename T1> | ||
T *QRecyclePool<T, Step>::New(T1 &a) | ||
{ | ||
T *rv = d->allocate(); | ||
new (rv) T(a); | ||
return rv; | ||
} | ||
|
||
template<typename T, int Step> | ||
void QRecyclePool<T, Step>::Delete(T *t) | ||
{ | ||
t->~T(); | ||
QRecyclePoolPrivate<T, Step>::dispose(t); | ||
} | ||
|
||
template<typename T, int Step> | ||
void QRecyclePoolPrivate<T, Step>::releaseIfPossible() | ||
{ | ||
if (recyclePoolHold || outstandingItems) | ||
return; | ||
|
||
Page *p = currentPage; | ||
while (p) { | ||
Page *n = p->nextPage; | ||
qFree(p); | ||
p = n; | ||
} | ||
|
||
delete this; | ||
} | ||
|
||
template<typename T, int Step> | ||
T *QRecyclePoolPrivate<T, Step>::allocate() | ||
{ | ||
PoolType *rv = 0; | ||
if (nextAllocated) { | ||
rv = nextAllocated; | ||
nextAllocated = rv->nextAllocated; | ||
} else if (currentPage && currentPage->free) { | ||
rv = (PoolType *)(currentPage->array + (Step - currentPage->free) * sizeof(PoolType)); | ||
currentPage->free--; | ||
} else { | ||
Page *p = (Page *)qMalloc(sizeof(Page)); | ||
p->nextPage = currentPage; | ||
p->free = Step; | ||
currentPage = p; | ||
|
||
rv = (PoolType *)currentPage->array; | ||
currentPage->free--; | ||
} | ||
|
||
rv->pool = this; | ||
++outstandingItems; | ||
return rv; | ||
} | ||
|
||
template<typename T, int Step> | ||
void QRecyclePoolPrivate<T, Step>::dispose(T *t) | ||
{ | ||
PoolType *pt = static_cast<PoolType *>(t); | ||
Q_ASSERT(pt->pool && pt->pool->cookie == QRECYCLEPOOLCOOKIE); | ||
|
||
QRecyclePoolPrivate<T, Step> *This = pt->pool; | ||
pt->nextAllocated = This->nextAllocated; | ||
This->nextAllocated = pt; | ||
--This->outstandingItems; | ||
This->releaseIfPossible(); | ||
} | ||
|
||
QT_END_NAMESPACE | ||
|
||
#endif // QRECYCLEPOOL_P_H |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.