Skip to content

Commit 6a29110

Browse files
author
builder@murbella
committed
Eliminate complex typed static variables
Complex typed static variables (e.g. maps) in dll-s are to avoid. On Windows they are not initialised in time (or at all) when the dll is dynamically loaded. The current use of static QHash data members results in crash on Windows when the PythonQt.dll is loaded. See details here: http://stackoverflow.com/questions/5114683/loading-dll-not-initializing-static-c-classes
1 parent 503597b commit 6a29110

8 files changed

+196
-153
lines changed

‎src/PythonQtClassInfo.cpp

-2
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,6 @@
4747
#include <QMetaObject>
4848
#include <QMetaEnum>
4949

50-
QHash<QByteArray, int> PythonQtMethodInfo::_parameterTypeDict;
51-
5250
PythonQtClassInfo::PythonQtClassInfo() {
5351
_meta = NULL;
5452
_constructors = NULL;

‎src/PythonQtClassWrapper.cpp

+7-7
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
static PyObject* PythonQtInstanceWrapper_invert(PythonQtInstanceWrapper* wrapper)
5353
{
5454
PyObject* result = NULL;
55-
static QByteArray memberName = "__invert__";
55+
static const char* memberName = "__invert__";
5656
PythonQtMemberInfo opSlot = wrapper->classInfo()->member(memberName);
5757
if (opSlot._type == PythonQtMemberInfo::Slot) {
5858
result = PythonQtSlotFunction_CallImpl(wrapper->classInfo(), wrapper->_obj, opSlot._slot, NULL, NULL, wrapper->_wrappedPtr);
@@ -63,7 +63,7 @@ static PyObject* PythonQtInstanceWrapper_invert(PythonQtInstanceWrapper* wrapper
6363
static PyObject* PythonQtInstanceWrapper_negative(PythonQtInstanceWrapper* wrapper)
6464
{
6565
PyObject* result = NULL;
66-
static QByteArray memberName = "__sub__";
66+
static const char* memberName = "__sub__";
6767
PythonQtMemberInfo opSlot = wrapper->classInfo()->member(memberName);
6868
if (opSlot._type == PythonQtMemberInfo::Slot) {
6969
result = PythonQtSlotFunction_CallImpl(wrapper->classInfo(), wrapper->_obj, opSlot._slot, NULL, NULL, wrapper->_wrappedPtr);
@@ -75,7 +75,7 @@ static int PythonQtInstanceWrapper_nonzero(PythonQtInstanceWrapper* wrapper)
7575
{
7676
int result = (wrapper->_wrappedPtr == NULL && wrapper->_obj == NULL)?0:1;
7777
if (result) {
78-
static QByteArray memberName = "__nonzero__";
78+
static const char* memberName = "__nonzero__";
7979
PythonQtMemberInfo opSlot = wrapper->classInfo()->member(memberName);
8080
if (opSlot._type == PythonQtMemberInfo::Slot) {
8181
PyObject* resultObj = PythonQtSlotFunction_CallImpl(wrapper->classInfo(), wrapper->_obj, opSlot._slot, NULL, NULL, wrapper->_wrappedPtr);
@@ -92,7 +92,7 @@ static Py_ssize_t PythonQtInstanceWrapper_length(PythonQtInstanceWrapper* wrappe
9292
{
9393
qint64 result = -1;
9494
if (wrapper->_wrappedPtr != NULL || wrapper->_obj != NULL) {
95-
static QByteArray memberName = "__len__";
95+
static const char* memberName = "__len__";
9696
PythonQtMemberInfo opSlot = wrapper->classInfo()->member(memberName);
9797
if (opSlot._type == PythonQtMemberInfo::Slot) {
9898
PyObject* resultObj = PythonQtSlotFunction_CallImpl(wrapper->classInfo(), wrapper->_obj, opSlot._slot, NULL, NULL, wrapper->_wrappedPtr);
@@ -191,15 +191,15 @@ static PyObject* PythonQtInstanceWrapper_mul(PyObject* self, PyObject* other)
191191
#define BINARY_OP(NAME) \
192192
static PyObject* PythonQtInstanceWrapper_ ## NAME(PyObject* self, PyObject* other) \
193193
{ \
194-
static const QByteArray opName("__" #NAME "__"); \
194+
static const const char* opName("__" #NAME "__"); \
195195
return PythonQtInstanceWrapper_binaryfunc(self, other, opName); \
196196
}
197197

198198
#define BINARY_OP_INPLACE(NAME) \
199199
static PyObject* PythonQtInstanceWrapper_i ## NAME(PyObject* self, PyObject* other) \
200200
{ \
201-
static const QByteArray opName("__i" #NAME "__"); \
202-
static const QByteArray fallbackName("__" #NAME "__"); \
201+
static const const char* opName("__i" #NAME "__"); \
202+
static const const char* fallbackName("__" #NAME "__"); \
203203
return PythonQtInstanceWrapper_binaryfunc(self, other, opName, fallbackName); \
204204
}
205205

‎src/PythonQtConversion.cpp

+28-15
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,21 @@ PythonQtValueStorage<qint64, 128> PythonQtConv::global_valueStorage;
5151
PythonQtValueStorage<void*, 128> PythonQtConv::global_ptrStorage;
5252
PythonQtValueStorageWithCleanup<QVariant, 128> PythonQtConv::global_variantStorage;
5353

54-
QHash<int, PythonQtConvertMetaTypeToPythonCB*> PythonQtConv::_metaTypeToPythonConverters;
55-
QHash<int, PythonQtConvertPythonToMetaTypeCB*> PythonQtConv::_pythonToMetaTypeConverters;
54+
QHash<int, PythonQtConvertMetaTypeToPythonCB*>* PythonQtConv::GetMetaTypeToPythonConverters() {
55+
static QHash<int, PythonQtConvertMetaTypeToPythonCB*>* _metaTypeToPythonConverters = nullptr;
56+
if (_metaTypeToPythonConverters == nullptr) {
57+
_metaTypeToPythonConverters = new QHash<int, PythonQtConvertMetaTypeToPythonCB*>();
58+
}
59+
return _metaTypeToPythonConverters;
60+
}
61+
62+
QHash<int, PythonQtConvertPythonToMetaTypeCB*>* PythonQtConv::GetPythonToMetaTypeConverters() {
63+
static QHash<int, PythonQtConvertPythonToMetaTypeCB*>* _pythonToMetaTypeConverters = nullptr;
64+
if (_pythonToMetaTypeConverters == nullptr) {
65+
_pythonToMetaTypeConverters = new QHash<int, PythonQtConvertPythonToMetaTypeCB*>();
66+
}
67+
return _pythonToMetaTypeConverters;
68+
}
5669

5770
PyObject* PythonQtConv::GetPyBool(bool val)
5871
{
@@ -103,7 +116,7 @@ PyObject* PythonQtConv::ConvertQtValueToPython(const PythonQtMethodInfo::Paramet
103116

104117
if (info.typeId >= QMetaType::User) {
105118
// if a converter is registered, we use is:
106-
PythonQtConvertMetaTypeToPythonCB* converter = _metaTypeToPythonConverters.value(info.typeId);
119+
PythonQtConvertMetaTypeToPythonCB* converter = GetMetaTypeToPythonConverters()->value(info.typeId);
107120
if (converter) {
108121
return (*converter)(info.pointerCount==0?data:*((void**)data), info.typeId);
109122
}
@@ -254,7 +267,7 @@ PyObject* PythonQtConv::convertQtValueToPythonInternal(int type, const void* dat
254267
default:
255268
// check if we have a QList of pointers, which we can circumvent with a QList<void*>
256269
if (info.isQList && (info.innerNamePointerCount == 1)) {
257-
static int id = QMetaType::type("QList<void*>");
270+
int id = QMetaType::type("QList<void*>");
258271
PythonQtValueStorage_ADD_VALUE(global_variantStorage, QVariant, QVariant::Type(id), ptr);
259272
// return the constData pointer that will be filled with the result value later on
260273
ptr = (void*)((QVariant*)ptr)->constData();
@@ -295,13 +308,13 @@ void* PythonQtConv::handlePythonToQtAutoConversion(int typeId, PyObject* obj, vo
295308
{
296309
void* ptr = alreadyAllocatedCPPObject;
297310

298-
static int penId = QMetaType::type("QPen");
299-
static int brushId = QMetaType::type("QBrush");
300-
static int cursorId = QMetaType::type("QCursor");
301-
static int colorId = QMetaType::type("QColor");
302-
static PyObject* qtGlobalColorEnum = PythonQtClassInfo::findEnumWrapper("Qt::GlobalColor", NULL);
311+
int penId = QMetaType::type("QPen");
312+
int brushId = QMetaType::type("QBrush");
313+
int cursorId = QMetaType::type("QCursor");
314+
int colorId = QMetaType::type("QColor");
315+
PyObject* qtGlobalColorEnum = PythonQtClassInfo::findEnumWrapper("Qt::GlobalColor", NULL);
303316
if (typeId == cursorId) {
304-
static PyObject* qtCursorShapeEnum = PythonQtClassInfo::findEnumWrapper("Qt::CursorShape", NULL);
317+
PyObject* qtCursorShapeEnum = PythonQtClassInfo::findEnumWrapper("Qt::CursorShape", NULL);
305318
if ((PyObject*)obj->ob_type == qtCursorShapeEnum) {
306319
Qt::CursorShape val = (Qt::CursorShape)PyInt_AsLong(obj);
307320
if (!ptr) {
@@ -313,7 +326,7 @@ void* PythonQtConv::handlePythonToQtAutoConversion(int typeId, PyObject* obj, vo
313326
}
314327
} else if (typeId == penId) {
315328
// brushes can be created from QColor and from Qt::GlobalColor (and from brushes, but that's the default)
316-
static PyObject* qtColorClass = PythonQt::priv()->getClassInfo("QColor")->pythonQtClassWrapper();
329+
PyObject* qtColorClass = PythonQt::priv()->getClassInfo("QColor")->pythonQtClassWrapper();
317330
if ((PyObject*)obj->ob_type == qtGlobalColorEnum) {
318331
Qt::GlobalColor val = (Qt::GlobalColor)PyInt_AsLong(obj);
319332
if (!ptr) {
@@ -332,7 +345,7 @@ void* PythonQtConv::handlePythonToQtAutoConversion(int typeId, PyObject* obj, vo
332345
}
333346
} else if (typeId == brushId) {
334347
// brushes can be created from QColor and from Qt::GlobalColor (and from brushes, but that's the default)
335-
static PyObject* qtColorClass = PythonQt::priv()->getClassInfo("QColor")->pythonQtClassWrapper();
348+
PyObject* qtColorClass = PythonQt::priv()->getClassInfo("QColor")->pythonQtClassWrapper();
336349
if ((PyObject*)obj->ob_type == qtGlobalColorEnum) {
337350
Qt::GlobalColor val = (Qt::GlobalColor)PyInt_AsLong(obj);
338351
if (!ptr) {
@@ -649,7 +662,7 @@ void* PythonQtConv::ConvertPythonToQt(const PythonQtMethodInfo::ParameterInfo& i
649662
if (info.typeId == PythonQtMethodInfo::Unknown || info.typeId >= QMetaType::User) {
650663
// check for QList<AnyPtr*> case, where we will use a QList<void*> QVariant
651664
if (info.isQList && (info.innerNamePointerCount == 1)) {
652-
static int id = QMetaType::type("QList<void*>");
665+
int id = QMetaType::type("QList<void*>");
653666
if (!alreadyAllocatedCPPObject) {
654667
PythonQtValueStorage_ADD_VALUE_IF_NEEDED(alreadyAllocatedCPPObject, global_variantStorage, QVariant, QVariant::Type(id), ptr);
655668
ptr = (void*)((QVariant*)ptr)->constData();
@@ -668,7 +681,7 @@ void* PythonQtConv::ConvertPythonToQt(const PythonQtMethodInfo::ParameterInfo& i
668681
// We only do this for registered type > QMetaType::User for performance reasons.
669682
if (info.typeId >= QMetaType::User) {
670683
// Maybe we have a special converter that is registered for that type:
671-
PythonQtConvertPythonToMetaTypeCB* converter = _pythonToMetaTypeConverters.value(info.typeId);
684+
PythonQtConvertPythonToMetaTypeCB* converter = GetPythonToMetaTypeConverters()->value(info.typeId);
672685
if (converter) {
673686
if (!alreadyAllocatedCPPObject) {
674687
// create a new empty variant of concrete type:
@@ -1174,7 +1187,7 @@ QVariant PythonQtConv::PyObjToQVariant(PyObject* val, int type)
11741187
} else if (type >= QVariant::UserType) {
11751188
// not an instance wrapper, but there might be other converters
11761189
// Maybe we have a special converter that is registered for that type:
1177-
PythonQtConvertPythonToMetaTypeCB* converter = _pythonToMetaTypeConverters.value(type);
1190+
PythonQtConvertPythonToMetaTypeCB* converter = GetPythonToMetaTypeConverters()->value(type);
11781191
if (converter) {
11791192
// allocate a default object of the needed type:
11801193
v = QVariant(type, (const void*)NULL);

‎src/PythonQtConversion.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -160,10 +160,10 @@ class PYTHONQT_EXPORT PythonQtConv {
160160
static QString CPPObjectToString(int type, const void* data);
161161

162162
//! register a converter callback from python to cpp for given metatype
163-
static void registerPythonToMetaTypeConverter(int metaTypeId, PythonQtConvertPythonToMetaTypeCB* cb) { _pythonToMetaTypeConverters.insert(metaTypeId, cb); }
163+
static void registerPythonToMetaTypeConverter(int metaTypeId, PythonQtConvertPythonToMetaTypeCB* cb) { GetPythonToMetaTypeConverters()->insert(metaTypeId, cb); }
164164

165165
//! register a converter callback from cpp to python for given metatype
166-
static void registerMetaTypeToPythonConverter(int metaTypeId, PythonQtConvertMetaTypeToPythonCB* cb) { _metaTypeToPythonConverters.insert(metaTypeId, cb); }
166+
static void registerMetaTypeToPythonConverter(int metaTypeId, PythonQtConvertMetaTypeToPythonCB* cb) { GetMetaTypeToPythonConverters()->insert(metaTypeId, cb); }
167167

168168
//! converts the Qt parameter given in \c data, interpreting it as a \c type registered qvariant/meta type, into a Python object,
169169
static PyObject* convertQtValueToPythonInternal(int type, const void* data);
@@ -187,8 +187,8 @@ class PYTHONQT_EXPORT PythonQtConv {
187187
static PythonQtValueStorageWithCleanup<QVariant, 128> global_variantStorage;
188188

189189
protected:
190-
static QHash<int, PythonQtConvertMetaTypeToPythonCB*> _metaTypeToPythonConverters;
191-
static QHash<int, PythonQtConvertPythonToMetaTypeCB*> _pythonToMetaTypeConverters;
190+
static QHash<int, PythonQtConvertMetaTypeToPythonCB*>* GetMetaTypeToPythonConverters();
191+
static QHash<int, PythonQtConvertPythonToMetaTypeCB*>* GetPythonToMetaTypeConverters();
192192

193193
//! handle automatic conversion of some special types (QColor, QBrush, ...)
194194
static void* handlePythonToQtAutoConversion(int typeId, PyObject* obj, void* alreadyAllocatedCPPObject);

‎src/PythonQtImporter.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -761,7 +761,7 @@ QString PythonQtImport::replaceExtension(const QString& str, const QString& ext)
761761
PyObject* PythonQtImport::getCodeFromPyc(const QString& file)
762762
{
763763
PyObject* code;
764-
const static QString pycStr("pyc");
764+
const QString pycStr("pyc");
765765
QString pyc = replaceExtension(file, pycStr);
766766
if (PythonQt::importInterface()->exists(pyc)) {
767767
time_t mtime = 0;

‎src/PythonQtInstanceWrapper.cpp

+11-11
Original file line numberDiff line numberDiff line change
@@ -248,46 +248,46 @@ static PyObject *PythonQtInstanceWrapper_richcompare(PythonQtInstanceWrapper* wr
248248
return Py_NotImplemented;
249249
}
250250

251-
QByteArray memberName;
251+
const char* memberName;
252252
switch (code) {
253253
case Py_LT:
254254
{
255-
static QByteArray name = "__lt__";
255+
static const char* name = "__lt__";
256256
memberName = name;
257257
}
258258
break;
259259

260260
case Py_LE:
261261
{
262-
static QByteArray name = "__le__";
262+
static const char* name = "__le__";
263263
memberName = name;
264264
}
265265
break;
266266

267267
case Py_EQ:
268268
{
269-
static QByteArray name = "__eq__";
269+
static const char* name = "__eq__";
270270
memberName = name;
271271
}
272272
break;
273273

274274
case Py_NE:
275275
{
276-
static QByteArray name = "__ne__";
276+
static const char* name = "__ne__";
277277
memberName = name;
278278
}
279279
break;
280280

281281
case Py_GT:
282282
{
283-
static QByteArray name = "__gt__";
283+
static const char* name = "__gt__";
284284
memberName = name;
285285
}
286286
break;
287287

288288
case Py_GE:
289289
{
290-
static QByteArray name = "__ge__";
290+
static const char* name = "__ge__";
291291
memberName = name;
292292
}
293293
break;
@@ -405,7 +405,7 @@ static PyObject *PythonQtInstanceWrapper_getattro(PyObject *obj,PyObject *name)
405405
}
406406

407407
{
408-
static const QByteArray dynamicDictString("py_dynamic_dict");
408+
static const char* dynamicDictString("py_dynamic_dict");
409409
// check for a dynamic dict getter slot
410410
PythonQtMemberInfo member = wrapper->classInfo()->member(dynamicDictString);
411411
if (member._type == PythonQtMemberInfo::Slot) {
@@ -490,15 +490,15 @@ static PyObject *PythonQtInstanceWrapper_getattro(PyObject *obj,PyObject *name)
490490
break;
491491
case PythonQtMemberInfo::NotFound:
492492
{
493-
static const QByteArray getterString("py_get_");
493+
const QByteArray getterString("py_get_");
494494
// check for a getter slot
495495
PythonQtMemberInfo member = wrapper->classInfo()->member(getterString + attributeName);
496496
if (member._type == PythonQtMemberInfo::Slot) {
497497
return PythonQtSlotFunction_CallImpl(wrapper->classInfo(), wrapper->_obj, member._slot, NULL, NULL, wrapper->_wrappedPtr);
498498
}
499499

500500
{
501-
static const QByteArray dynamicGetterString("py_dynamic_get_attrib");
501+
static const char* dynamicGetterString("py_dynamic_get_attrib");
502502
// check for a dynamic getter slot
503503
PythonQtMemberInfo member = wrapper->classInfo()->member(dynamicGetterString);
504504
if (member._type == PythonQtMemberInfo::Slot) {
@@ -625,7 +625,7 @@ static int PythonQtInstanceWrapper_setattro(PyObject *obj,PyObject *name,PyObjec
625625
}
626626
else if (member._type == PythonQtMemberInfo::NotFound) {
627627
// check for a setter slot
628-
static const QByteArray setterString("py_set_");
628+
const QByteArray setterString("py_set_");
629629
PythonQtMemberInfo setter = wrapper->classInfo()->member(setterString + attributeName);
630630
if (setter._type == PythonQtMemberInfo::Slot) {
631631
// call the setter and ignore the result value

0 commit comments

Comments
 (0)