Skip to content

Engine: Random crash in Object #888 #889

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eprikazchikov merged 1 commit into from
Dec 15, 2024
Merged

Engine: Random crash in Object #888 #889

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions thirdparty/next/inc/core/object.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
#include <map>
#include <queue>
#include <list>
#include <mutex>

#include <global.h>

Expand Down Expand Up @@ -94,6 +95,7 @@ class NEXT_LIBRARY_EXPORT Object {

public:
Object();
Object(const Object &origin);

virtual ~Object();

Expand Down Expand Up @@ -154,6 +156,8 @@ class NEXT_LIBRARY_EXPORT Object {
return result;
}

void blockSignals(bool block);

void emitSignal(const char *signal, const Variant &args = Variant());

static void enumObjects(Object *object, Object::ObjectList &list);
Expand Down Expand Up @@ -234,9 +238,13 @@ class NEXT_LIBRARY_EXPORT Object {

ObjectSystem *m_system;

mutable std::mutex m_mutex;

uint32_t m_uuid;
uint32_t m_cloned;

bool m_blockSignals;

private:
friend class ObjectTest;
friend class PoolWorker;
Expand Down
69 changes: 45 additions & 24 deletions thirdparty/next/src/core/object.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,9 @@
#include "core/objectsystem.h"
#include "core/uri.h"

#include <mutex>
#include <iostream>
#include <sstream>

static inline std::mutex &lockMutex(const Object *o) {
static std::mutex s_mutexPool[131];
return s_mutexPool[uint64_t(o) % sizeof(s_mutexPool) / sizeof(std::mutex)];
}

/*!
\module Core

Expand Down Expand Up @@ -257,16 +251,33 @@ Object::Link::Link() :
By default Object create without parent to assign the parent object use setParent().
*/
Object::Object() :
m_parent(nullptr),
m_currentSender(nullptr),
m_system(nullptr),
m_uuid(0),
m_cloned(0) {
m_parent(nullptr),
m_currentSender(nullptr),
m_system(nullptr),
m_uuid(0),
m_cloned(0),
m_blockSignals(false) {
PROFILE_FUNCTION();

setUUID(ObjectSystem::generateUUID());
}

Object::Object(const Object &origin) :
m_parent(origin.m_parent),
m_children(origin.m_children),
m_recievers(origin.m_recievers),
m_senders(origin.m_senders),
m_eventQueue(origin.m_eventQueue),
m_dynamicPropertyNames(origin.m_dynamicPropertyNames),
m_dynamicPropertyValues(origin.m_dynamicPropertyValues),
m_currentSender(origin.m_currentSender),
m_system(origin.m_system),
m_uuid(origin.m_uuid),
m_cloned(origin.m_cloned),
m_blockSignals(origin.m_blockSignals) {

}

Object::~Object() {
PROFILE_FUNCTION();

Expand All @@ -276,15 +287,15 @@ Object::~Object() {
m_system->removeObject(this);
}
{
std::lock_guard<std::mutex> locker(lockMutex(this));
std::lock_guard<std::mutex> locker(m_mutex);
while(!m_eventQueue.empty()) {
delete m_eventQueue.front();
m_eventQueue.pop();
}
}

for(auto it : m_senders) {
std::lock_guard<std::mutex> locker(lockMutex(it.sender));
std::lock_guard<std::mutex> locker(it.sender->m_mutex);
for(auto rcv = it.sender->m_recievers.begin(); rcv != it.sender->m_recievers.end(); ) {
if(*rcv == it) {
rcv = it.sender->m_recievers.erase(rcv);
Expand All @@ -294,12 +305,12 @@ Object::~Object() {
}
}
{
std::lock_guard<std::mutex> locker(lockMutex(this));
std::lock_guard<std::mutex> locker(m_mutex);
m_senders.clear();
}

for(auto it : m_recievers) {
std::lock_guard<std::mutex> locker(lockMutex(it.receiver));
std::lock_guard<std::mutex> locker(it.receiver->m_mutex);
for(auto snd = it.receiver->m_senders.begin(); snd != it.receiver->m_senders.end(); ) {
if(*snd == it) {
snd = it.receiver->m_senders.erase(snd);
Expand All @@ -309,7 +320,7 @@ Object::~Object() {
}
}
{
std::lock_guard<std::mutex> locker(lockMutex(this));
std::lock_guard<std::mutex> locker(m_mutex);
m_recievers.clear();
}

Expand Down Expand Up @@ -546,11 +557,11 @@ bool Object::connect(Object *sender, const char *signal, Object *receiver, const

if(!sender->isLinkExist(link)) {
{
std::lock_guard<std::mutex> locker(lockMutex(sender));
std::lock_guard<std::mutex> locker(sender->m_mutex);
sender->m_recievers.push_back(link);
}
{
std::lock_guard<std::mutex> locker(lockMutex(receiver));
std::lock_guard<std::mutex> locker(receiver->m_mutex);
receiver->m_senders.push_back(link);
}
return true;
Expand Down Expand Up @@ -584,7 +595,7 @@ bool Object::connect(Object *sender, const char *signal, Object *receiver, const
void Object::disconnect(Object *sender, const char *signal, Object *receiver, const char *method) {
PROFILE_FUNCTION();
if(sender) {
std::unique_lock<std::mutex> slocker(lockMutex(sender), std::defer_lock);
std::unique_lock<std::mutex> slocker(sender->m_mutex, std::defer_lock);

if(slocker.try_lock()) {
for(auto snd = sender->m_recievers.begin(); snd != sender->m_recievers.end(); ) {
Expand All @@ -594,7 +605,7 @@ void Object::disconnect(Object *sender, const char *signal, Object *receiver, co
if(receiver == nullptr || data.receiver == receiver) {
if(method == nullptr || (receiver && data.method == receiver->metaObject()->indexOfMethod(&method[1]))) {
if(data.receiver != sender) {
lockMutex(data.receiver).lock();
data.receiver->m_mutex.lock();
}
for(auto rcv = data.receiver->m_senders.begin(); rcv != data.receiver->m_senders.end(); ) {
if(*rcv == data) {
Expand All @@ -604,7 +615,7 @@ void Object::disconnect(Object *sender, const char *signal, Object *receiver, co
}
}
if(data.receiver != sender) {
lockMutex(data.receiver).unlock();
data.receiver->m_mutex.unlock();
}

snd = sender->m_recievers.erase(snd);
Expand Down Expand Up @@ -764,6 +775,12 @@ void Object::removeChild(Object *child) {
it++;
}
}
/*!
If \a block is true, signals emitted by this object will be discarded (i.e., emitting a signal will not invoke anything connected to it).
*/
void Object::blockSignals(bool block) {
m_blockSignals = block;
}
/*!
Send specific \a signal with \a args for all connected receivers.

Expand All @@ -776,8 +793,12 @@ void Object::removeChild(Object *child) {
*/
void Object::emitSignal(const char *signal, const Variant &args) {
PROFILE_FUNCTION();
if(m_blockSignals) {
return;
}

int32_t index = metaObject()->indexOfSignal(&signal[1]);
std::lock_guard<std::mutex> locker(lockMutex(this));
std::lock_guard<std::mutex> locker(m_mutex);
for(auto &it : m_recievers) {
Link *link = &(it);
if(link->signal == index) {
Expand Down Expand Up @@ -805,7 +826,7 @@ void Object::emitSignal(const char *signal, const Variant &args) {
*/
void Object::postEvent(Event *event) {
PROFILE_FUNCTION();
std::lock_guard<std::mutex> locker(lockMutex(this));
std::lock_guard<std::mutex> locker(m_mutex);
m_eventQueue.push(event);
}
/*!
Expand All @@ -817,7 +838,7 @@ void Object::processEvents() {
while(!m_eventQueue.empty()) {
Event *e = nullptr;
{
std::lock_guard<std::mutex> locker(lockMutex(this));
std::lock_guard<std::mutex> locker(m_mutex);
e = m_eventQueue.front();
m_eventQueue.pop();
}
Expand Down
7 changes: 5 additions & 2 deletions thirdparty/next/src/math/vector4.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,9 @@ Vector4::Vector4(areal x, areal y, areal z, areal w) :
*/
Vector4::Vector4(const Vector2 &vector) :
x(vector.x),
y(vector.y) {
y(vector.y),
z(0.0f),
w(0.0f) {
}
/*!
Constructs a 4D vector from the specified 2D \a vector. The z and w
Expand All @@ -91,7 +93,8 @@ Vector4::Vector4(const Vector2 &vector, areal z, areal w) :
Vector4::Vector4(const Vector3 &vector) :
x(vector.x),
y(vector.y),
z(vector.z) {
z(vector.z),
w(0.0f) {
}
/*!
Constructs a 4D vector from the specified 3D \a vector. The w
Expand Down
Loading